Changeset 2349


Ignore:
Timestamp:
Aug 10, 2017 3:44:04 PM (4 years ago)
Author:
Giersch
Message:

Add parameter ptich_rate to namelist and revise/add error messages

Location:
palm/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • palm/trunk/SCRIPTS/testsuite

    r2347 r2349  
    6565      sed -i -e "s/<replace_with_your_hostname>/${HOSTNAME}/g" ${tester_prefix}/.mrun.config
    6666      sed -i -e "s/<replace_with_your_local_username>/${USER}/g" ${tester_prefix}/.mrun.config
    67       sed -i -e "s/<hi>/lclocal/g" ${tester_prefix}/.mrun.config
     67      sed -i -e "s/<hi>/lcmuk/g" ${tester_prefix}/.mrun.config
    6868      sed -i -e "s#%base_directory    \$HOME/palm/current_version#%base_directory    ${tester_prefix}#g" ${tester_prefix}/.mrun.config
    6969      sed -i -e "s#%base_data         ~/palm/current_version/JOBS#%base_data         ${tester_prefix}/JOBS#g" ${tester_prefix}/.mrun.config
     
    8181   rm -rf ${tester_prefix}/MAKE_DEPOSITORY*
    8282   rm -rf ${tester_prefix}/SOURCES_FOR_RUN_*
    83    bash ${trunk_dir}/SCRIPTS/mbuild -h "lclocal" -K "parallel" -v -u
    84    bash ${trunk_dir}/SCRIPTS/mbuild -h "lclocal" -K "parallel" -v
     83   bash ${trunk_dir}/SCRIPTS/mbuild -h "lcmuk" -K "parallel" -v -u
     84   bash ${trunk_dir}/SCRIPTS/mbuild -h "lcmuk" -K "parallel" -v
    8585}
    8686
     
    101101   cp ${test_dir}/${1}_rc ${monitoring_dir}/${1}_rc_reference
    102102   [[ -f ${test_dir}/${1}_topo ]] && cp ${test_dir}/${1}_topo ${input_dir}/
    103    bash ${trunk_dir}/SCRIPTS/mrun -d ${1} -r "d3#" -h "lclocal" -K "parallel" -X "$NUM_PROC" -T "$NUM_PROC" -v -B > ${monitoring_dir}/${1}_stdout 2>&1
     103   bash ${trunk_dir}/SCRIPTS/mrun -d ${1} -r "d3#" -h "lcmuk" -K "parallel" -X "$NUM_PROC" -T "$NUM_PROC" -v -B > ${monitoring_dir}/${1}_stdout 2>&1
    104104   grep -A 99999 "Run-control output" ${monitoring_dir}/${1}_rc 1> ${monitoring_dir}/RC 2> /dev/null
    105105   grep -A 99999 "Run-control output" ${monitoring_dir}/${1}_rc_reference 1> ${monitoring_dir}/RC_REF 2> /dev/null
  • palm/trunk/SOURCE/wind_turbine_model_mod.f90

    r2343 r2349  
    2626! -----------------
    2727! $Id$
     28! Add parameter pitch_rate to namelist and revise/add error messages
     29!
     30! 2343 2017-08-08 11:28:43Z Giersch
    2831! Unit correction in Doxygen comments
    2932!
     
    423426                                  rnac, rr, segment_length, segment_width,     &
    424427                                  slope2, speed_control, tilt, time_turbine_on,&
    425                                   turb_cd_nacelle, turb_cd_tower,              &
     428                                  turb_cd_nacelle, turb_cd_tower, pitch_rate,  &
    426429                                  yaw_control, yaw_speed, tl_cor
    427430
     
    438441!--    Read user-defined namelist
    439442       READ ( 11, wind_turbine_par, IOSTAT=ierrn )
    440        
     443
    441444       IF ( ierrn < 0 )  THEN
    442           message_string = 'errors in \$wind_turbine_par'
     445          message_string = 'no wind_turbine_par-NAMELIST found: '  //          &
     446                           'End of file has reached'
    443447          CALL message( 'wtm_parin', 'PA0460', 1, 2, 0, 6, 0 )
     448       ELSEIF ( ierrn > 0 ) THEN
     449          message_string = 'errors in wind_turbine_par-NAMELIST: '  //          &
     450                           'some variables for steering may not be properly set'
     451          CALL message( 'wtm_parin', 'PA0466', 1, 2, 0, 6, 0 )               
    444452       ENDIF
    445453       
Note: See TracChangeset for help on using the changeset viewer.