Changeset 2410 for palm/trunk


Ignore:
Timestamp:
Sep 6, 2017 8:16:30 AM (7 years ago)
Author:
Giersch
Message:

Revise error message PA0462 and change lclocal to lcmuk in testsuite

Location:
palm/trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • palm/trunk/SCRIPTS/palmbuild

    r2404 r2410  
    2222# Current revisions:
    2323# ------------------
    24 # Initial revision
     24#
    2525#
    2626# Former revisions:
    2727# -----------------
    2828# $Id$
     29# Initial revision
     30#
     31# 2404 2017-09-05 09:33:14Z raasch
    2932#
    3033#------------------------------------------------------------------------------#
  • palm/trunk/SCRIPTS/palmrun

    r2405 r2410  
    2222# Current revisions:
    2323# ------------------
    24 # initial revision
     24#
    2525#
    2626# Former revisions:
    2727# -----------------
    2828# $Id$
     29# initial revision
     30#
     31# 2405 2017-09-05 11:17:46Z raasch
    2932#
    3033#
  • palm/trunk/SCRIPTS/testsuite

    r2372 r2410  
    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

    r2349 r2410  
    2626! -----------------
    2727! $Id$
     28! Revise error message PA0462
     29!
     30! 2349 2017-08-10 15:44:04Z Giersch
    2831! Add parameter pitch_rate to namelist and revise/add error messages
    2932!
     
    474477       IF ( ANY( omega_rot(1:nturbines) < 0.0 ) )  THEN
    475478          message_string = 'omega_rot < 0.0, Please set omega_rot to '     // &
    476                            'a value larger than zero'
     479                           'a value larger than or equal to zero'
    477480          CALL message( 'wtm_check_parameters', 'PA0462', 1, 2, 0, 6, 0 )
    478481       ENDIF
     
    23502353       min_reg25 = ( slope25 - SQRT( slope25 * ( slope25 - 4.0_wp *            &
    23512354                                                 slope2 * vs_sysp ) ) ) /      &
    2352                    ( 2.0_wp * slope2 )
     2355                   ( 2.0_wp * slope2 ) 
    23532356!
    23542357!--    Frequency for the simple low pass filter
  • palm/trunk/UTIL/Makefile_utilities

    r2380 r2410  
    1818# Current revisions:
    1919# -----------------
     20#
     21#
     22# Former revisions:
     23# -----------------
     24# $Id$
    2025# file renamed to Makefile_utilities
    2126# executables are created in current working directory
    2227# interpret_config removed
    2328#
    24 # Former revisions:
    25 # -----------------
    26 # $Id$
     29# 2380 2017-09-01 08:33:46Z raasch
    2730#
    2831# 1046 2012-11-09 14:38:45Z maronga
Note: See TracChangeset for help on using the changeset viewer.