Changeset 2349 for palm/trunk

Timestamp:

Aug 10, 2017 3:44:04 PM (7 years ago)

Author:

Giersch

Message:

Add parameter ptich_rate to namelist and revise/add error messages

Location:

palm/trunk

Files:

• SCRIPTS/testsuite (modified) (3 diffs)
• SOURCE/wind_turbine_model_mod.f90 (modified) (3 diffs)

palm/trunk/SCRIPTS/testsuite

@@ -65 +65 @@
       sed -i -e "s/<replace_with_your_hostname>/${HOSTNAME}/g" ${tester_prefix}/.mrun.config
       sed -i -e "s/<replace_with_your_local_username>/${USER}/g" ${tester_prefix}/.mrun.config
-      sed -i -e "s/<hi>/lclocal/g" ${tester_prefix}/.mrun.config
+      sed -i -e "s/<hi>/lcmuk/g" ${tester_prefix}/.mrun.config
       sed -i -e "s#%base_directory    \$HOME/palm/current_version#%base_directory    ${tester_prefix}#g" ${tester_prefix}/.mrun.config
       sed -i -e "s#%base_data         ~/palm/current_version/JOBS#%base_data         ${tester_prefix}/JOBS#g" ${tester_prefix}/.mrun.config
@@ -81 +81 @@
    rm -rf ${tester_prefix}/MAKE_DEPOSITORY*
    rm -rf ${tester_prefix}/SOURCES_FOR_RUN_*
-   bash ${trunk_dir}/SCRIPTS/mbuild -h "lclocal" -K "parallel" -v -u
-   bash ${trunk_dir}/SCRIPTS/mbuild -h "lclocal" -K "parallel" -v
+   bash ${trunk_dir}/SCRIPTS/mbuild -h "lcmuk" -K "parallel" -v -u
+   bash ${trunk_dir}/SCRIPTS/mbuild -h "lcmuk" -K "parallel" -v
 }
 
@@ -101 +101 @@
    cp ${test_dir}/${1}_rc ${monitoring_dir}/${1}_rc_reference
    [[ -f ${test_dir}/${1}_topo ]] && cp ${test_dir}/${1}_topo ${input_dir}/
-   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
+   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
    grep -A 99999 "Run-control output" ${monitoring_dir}/${1}_rc 1> ${monitoring_dir}/RC 2> /dev/null
    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

@@ -26 +26 @@
 ! -----------------
 ! $Id$
+! Add parameter pitch_rate to namelist and revise/add error messages 
+! 
+! 2343 2017-08-08 11:28:43Z Giersch
 ! Unit correction in Doxygen comments
 ! 
@@ -423 +426 @@
                                   rnac, rr, segment_length, segment_width,     &
                                   slope2, speed_control, tilt, time_turbine_on,&
-                                  turb_cd_nacelle, turb_cd_tower,              &
+                                  turb_cd_nacelle, turb_cd_tower, pitch_rate,  &
                                   yaw_control, yaw_speed, tl_cor
 
@@ -438 +441 @@
 !--    Read user-defined namelist
        READ ( 11, wind_turbine_par, IOSTAT=ierrn )
-       
+
        IF ( ierrn < 0 )  THEN
-          message_string = 'errors in \$wind_turbine_par'
+          message_string = 'no wind_turbine_par-NAMELIST found: '  //          &
+                           'End of file has reached'
           CALL message( 'wtm_parin', 'PA0460', 1, 2, 0, 6, 0 )
+       ELSEIF ( ierrn > 0 ) THEN
+          message_string = 'errors in wind_turbine_par-NAMELIST: '  //          &
+                           'some variables for steering may not be properly set'
+          CALL message( 'wtm_parin', 'PA0466', 1, 2, 0, 6, 0 )               
        ENDIF