Changeset 2257


Ignore:
Timestamp:
Jun 7, 2017 2:07:05 PM (4 years ago)
Author:
witha
Message:

Bugfix in PALM-WTM, modifications for lceddy

Location:
palm/trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • palm/trunk/SCRIPTS/mbuild

    r1945 r2257  
    2727# -----------------
    2828# $Id$
     29# adjustments for lceddy, removed lcflow-specific code
     30#
     31# 1945 2016-06-15 07:17:24Z raasch
    2932#
    3033# 1944 2016-06-15 06:29:00Z raasch
     
    528531        (lccrayb)        remote_address=130.73.233.1;;
    529532        (lccrayh)        remote_address=130.75.4.1;;
    530         (lcflow)         remote_address="flow02.hpc.uni-oldenburg.de";;
    531533        (lckordi)        remote_adress=210.219.61.8;;
    532534        (lcmuk)          remote_address=130.75.105.2;;
     
    13711373          then
    13721374             . $modules
    1373           elif [[ $remote_host = lcflow ]]
    1374           then
    1375              eval `$MODULESHOME/bin/modulecmd ksh load ${modules}`
     1375          elif [[ $remote_host = lceddy ]]
     1376          then
     1377             eval `$MODULESHOME/libexec/lmod load ${modules}`   
    13761378          else
    13771379             eval init_cmds=$init_cmds
  • palm/trunk/SCRIPTS/mrun

    r2186 r2257  
    2727# -----------------
    2828# $Id$
     29# adjustments for lceddy, removed lcflow-specific code
     30#
     31# 2186 2017-03-21 05:36:31Z raasch
    2932#
    3033# 2185 2017-03-21 05:09:29Z raasch
     
    652655    do_remote=true
    653656    case  $host  in
    654         (ibm|ibmh|ibmkisti|ibmku|ibms|nech|lcbullhh|lccrayb|lccrayh|lccrayf|lcflow|lckyoto|lcocean|unics|lcxe6|lcxt5m|lck|lckiaps|lckordi|lckyuh|lckyut|lcsb)  true;;
     657        (ibm|ibmh|ibmkisti|ibmku|ibms|nech|lcbullhh|lccrayb|lccrayh|lccrayf|lceddy|lckyoto|lcocean|unics|lcxe6|lcxt5m|lck|lckiaps|lckordi|lckyuh|lckyut|lcsb)  true;;
    655658        (*)  printf "\n"
    656659             printf "\n  +++ sorry: execution of batch jobs on remote host \"$host\""
     
    810813                   do_remote=true
    811814                   case  $host  in
    812                        (ibm|ibmh|ibmkisti|ibmku|ibms|lcbullhh|lccrayb|lccrayh|lccrayf|lcflow|lckyoto|lcocean|nech|unics|lcxe6|lcxt5m|lck|lckiaps|lckordi|lckyuh|lckyut|lcsb)  true;;
     815                       (ibm|ibmh|ibmkisti|ibmku|ibms|lcbullhh|lccrayb|lccrayh|lccrayf|lceddy|lckyoto|lcocean|nech|unics|lcxe6|lcxt5m|lck|lckiaps|lckordi|lckyuh|lckyut|lcsb)  true;;
    813816                       (*)  printf "\n  +++ sorry: execution of batch jobs on remote host \"$host\""
    814817                            printf "\n      is not available"
     
    10741077    do_remote=true
    10751078    case  $host  in
    1076         (ibm|ibmh|ibmkisti|ibmku|ibms|lcbullhh|lccrayb|lccrayh|lccrayf|lcflow|lckyoto|lcocean|nech|unics|lcxe6|lcxt5m|lck|lckiaps|lckordi|lckyuh|lckyut|lcsb)  true;;
     1079        (ibm|ibmh|ibmkisti|ibmku|ibms|lcbullhh|lccrayb|lccrayh|lccrayf|lceddy|lckyoto|lcocean|nech|unics|lcxe6|lcxt5m|lck|lckiaps|lckordi|lckyuh|lckyut|lcsb)  true;;
    10771080        (*)  printf "\n"
    10781081             printf "\n  +++ sorry: execution of batch jobs on remote host \"$host\""
     
    11031106       # CHECK, IF THE NUMBER OF CORES PER NODE HAS BEEN GIVEN UND IF IT IS AN
    11041107       # INTEGRAL DIVISOR OF THE TOTAL NUMBER OF CORES GIVEN BY OPTION -X
    1105     if [[ "$tasks_per_node" = ""  &&  $host != lcflow  &&  $host != lcxt5m ]]
     1108    if [[ "$tasks_per_node" = ""  &&  $host != lcxt5m ]]
    11061109    then
    11071110       printf "\n"
     
    11191122    fi
    11201123
    1121     if [[ $host != lcflow  &&  $host != lcxt5m ]]
     1124    if [[ $host != lcxt5m ]]
    11221125    then
    11231126       (( nodes = numprocs / ( tasks_per_node * threads_per_task ) ))
     
    24212424             [[ ! -f a.out ]]  &&  compile_error=true
    24222425            continue   # STATUS=1, IF a.out EXISTS
    2423           elif [[ $localhost = lcflow ]]
    2424           then
    2425              printf "      compiler is called via ssh on \"flow\" \n"
    2426              /usr/bin/ssh  $SSH_PORTOPT  flow02.hpc.uni-oldenburg.de -l $usern "$init_cmds $module_calls cd $TEMPDIR; make $mopts -f Makefile PROG=a.out F90=$compiler_name COPT=\"$cpp_options\" F90FLAGS=\"$fopts\" LDFLAGS=\"$lopts\" "
    2427              check_for_file=`/usr/bin/ssh $SSH_PORTOPT flow02.hpc.uni-oldenburg.de -l $usern "ls $TEMPDIR/a.out 2> /dev/null"`
    2428              [[ "$check_for_file" = "" ]]  &&  compile_error=true
    2429              continue   # STATUS=1, IF a.out EXISTS
    24302426          elif [[ $localhost = lcbullhh  ||  $localhost = lccrayb  ||  $localhost = lccrayf ||  $localhost = lccrayh ]]
    24312427          then
     2428             make $mopts -f Makefile PROG=a.out  F90=$compiler_name  COPT="$cpp_options"  F90FLAGS="$fopts"  LDFLAGS="$lopts"
     2429          elif [[ $localhost = lceddy ]]
     2430          then
     2431             which mpifc
    24322432             make $mopts -f Makefile PROG=a.out  F90=$compiler_name  COPT="$cpp_options"  F90FLAGS="$fopts"  LDFLAGS="$lopts"
    24332433          else
     
    31003100                   # COPY HOSTFILE FROM SOURCE DIRECTORY OR CREATE IT, IF IT
    31013101                   # DOES NOT EXIST
    3102                 if [[  $host != lcbullhh  && $host != lccrayb  &&  $host != lccrayf  && $host != lccrayh  &&  $host != lckyuh  &&  $host != lckyut  &&  $host != lcocean ]]
     3102                if [[  $host != lcbullhh  && $host != lccrayb  &&  $host != lccrayf  && $host != lccrayh  &&  $host != lckyuh  &&  $host != lckyut  &&  $host != lcocean &&  $host != lceddy ]]
    31033103                then
    31043104                   if [[ -f $hostfile ]]
     
    31673167                   elif [[ $host = lcxe6  ||  $host = lcxt5m ]]
    31683168                   then
    3169                        aprun  -n $ii  -N $tasks_per_node  a.out  <  runfile_atmos
    3170                    elif [[ $host = lcflow ]]
    3171                    then
    3172                       mpirun -np $ii a.out  < runfile_atmos
     3169                    aprun  -n $ii  -N $tasks_per_node  a.out  <  runfile_atmos
     3170                   elif [[ $host = lceddy ]]
     3171                   then
     3172                      echo $ii
     3173                      echo $tasks_per_node
     3174                      echo $nodes
     3175                      mpirun -n $ii a.out  <  runfile_atmos
    31733176                   elif [[ $host = lcocean ]]
    31743177                   then
     
    31773180                   then
    31783181                      mpirun_rsh -hostfile $PBS_NODEFILE -np `cat $PBS_NODEFILE | wc -l` a.out  < runfile_atmos
     3182
    31793183                   elif [[ $host = lckiaps ]]
    31803184                   then
     
    40814085          then
    40824086
    4083              if [[ $localhost = lcbullhh  ||  $localhost = lccrayb  ||  $localhost = lccrayh  ||  $localhost = nech  ||  $localhost = ibmh  ||  $localhost = ibmkisti  ||  $localhost = ibmku  ||  $localhost = ibms  ||  $localhost = lcflow  ||  $localhost = lckyu*  ||  $localhost = lcxe6 ]]
     4087             if [[ $localhost = lcbullhh  ||  $localhost = lccrayb  ||  $localhost = lccrayh  ||  $localhost = nech  ||  $localhost = ibmh  ||  $localhost = ibmkisti  ||  $localhost = ibmku  ||  $localhost = ibms  ||  $localhost = lceddy  ||  $localhost = lckyu*  ||  $localhost = lcxe6 ]]
    40844088             then
    40854089                echo "*** ssh will be used to initiate restart-runs!"
     
    41104114                   then
    41114115                      ssh $SSH_PORTOPT $usern@gaiad "ssh $SSH_PORTOPT $return_address -l $return_username \"PATH=\\\$PATH:$LOCAL_MRUN_PATH;export PALM_BIN=$LOCAL_MRUN_PATH;cd $LOCAL_PWD; $mc\" "
    4112                    elif [[ $localhost = lcflow ]]
     4116                   elif [[ $localhost = lceddy ]]
    41134117                   then
    41144118                      /usr/bin/ssh $SSH_PORTOPT $return_address -l $return_username "PATH=\$PATH:$LOCAL_MRUN_PATH;export PALM_BIN=$LOCAL_MRUN_PATH;cd $LOCAL_PWD; $mc "
     
    44964500    echo  "export LOCAL_MRUN_PATH"                      >>  $jobfile
    44974501
    4498        # lcflow ALSO REQUIRES TO PROVIDE PATH FOR THE PALM-SCRIPTS
    4499 #    if [[ $host = lcflow  ||  $localhost = lcflow ]]
    4500 #    then
     4502       # lceddy ALSO REQUIRES TO PROVIDE PATH FOR THE PALM-SCRIPTS
     4503    if [[ $host = lceddy  ||  $localhost = lceddy ]]
     4504    then
    45014505       echo  "export PALM_BIN=$PALM_BIN" | sed -e 's:'$HOME':$HOME:'   >>  $jobfile
    45024506       echo  "export PATH=\$PATH:\$PALM_BIN"              >>  $jobfile
    4503 #    fi
     4507    fi
    45044508
    45054509       # CALL MRUN WITHIN THE JOB (SETTING QUEUE IS A WORKAROUND FOR ibmkisti)
  • palm/trunk/SCRIPTS/subjob

    r2188 r2257  
    2828# -----------------
    2929# $Id$
     30# adjustments for lceddy, removed lcflow-specific code
     31#
     32# 2188 2017-03-21 06:42:42Z raasch
    3033#
    3134# 2187 2017-03-21 06:41:25Z raasch
     
    230233     (cs*)                   local_address=136.172.44.131; local_host=nech;;
    231234     (elephanta)             local_address=130.75.105.6;   local_host=lcmuk;;
    232      (flow01)                local_address=10.141.255.71;  local_host=lcflow;;
    233      (flow02)                local_address=10.141.255.72;  local_host=lcflow;;
     235     (hpcl*)                 local_address=eddy.hpc.uni-oldenburg.de; local_host=lceddy;;
     236     (cfd*)                  local_address=eddy.hpc.uni-oldenburg.de; local_host=lceddy;;
    234237     (node*)                 local_address=165.132.26.61   local_host=lck;;
    235238   #  (node*)                 local_address=210.219.61.8    local_host=lckordi;;
     
    404407        (lccrayh) queue=mpp1testq; remote_address=130.75.4.1; submcom="/opt/moab/default/bin/msub -E";;
    405408        (lccrayf) queue=small; remote_address=86.50.166.21; submcom=/opt/slurm/default/bin/sbatch;;
    406         (lcflow)  remote_address=10.140.1.72; submcom=qsub;;
     409        (lceddy)  remote_address=eddy.hpc.uni-oldenburg.de; submcom=sbatch;;
    407410        (lckyoto) remote_address=133.3.51.11; submcom=/thin/local/bin/qsub;;
    408411        (lck)     remote_address=165.132.26.61; submcom=/usr/torque/bin/qsub;;
     
    466469                     (*)                                     error=true;;
    467470                 esac;;
    468         (lcflow) case  $ndq  in
    469                      (cfd_lom_long.q|cfd_him_long.q|cfd_lom_serl.q|cfd_lom_shrt.q|cfd_him_shrt.q|cfd_ivy_shrt.q)  error=false;;
     471        (lceddy) case  $ndq  in
     472                     (eddy.p|cfdh.p|cfdl.p|carl.p|mpcs.p|mpcl.p|mpcb.p|all_nodes.p)  error=false;;
    470473                     (*)                                     error=true;;
    471474                 esac;;
     
    924927    fi
    925928
    926  elif [[ $remote_host = lcflow ]]
    927  then
    928     if [[ $numprocs != 0 ]]
    929     then
    930       pe_set="#$ -pe impi $numprocs"
    931     else
    932       pe_set="#$ -pe impi 1"
    933     fi
    934     if [[ $queue = default ]]
    935     then
    936       queue_set=""
    937     else
    938       queue_set="#$ -q $queue"
    939     fi
    940     [[ "$disc_space" = "" ]]  &&  disc_space=50
    941 
    942        cat > $job_to_send << %%END%%
     929
     930
     931 elif [[ $remote_host = lceddy ]]
     932 then
     933    cat > $job_to_send << %%END%%
    943934#!/bin/bash
    944 #$ -S /bin/bash
    945 #$ -N $job_name
    946 #$ -cwd
    947 #$ -l h_rt=$timestring
    948 #$ -l h_vmem=${memory}M
    949 #$ -o $remote_dayfile
    950 #$ -j y
    951 $pe_set
    952 #$ -R y
    953 #$ -l h_fsize=${disc_space}G
    954 $queue_set
     935#SBATCH -J $job_name
     936#SBATCH -t $timestring
     937#SBATCH -n $numprocs
     938#SBATCH -N $nodes
     939#SBATCH --cpus-per-task 1
     940#SBATCH -p $queue
     941#SBATCH -o $remote_dayfile
     942#SBATCH -e $remote_dayfile
     943#SBATCH --mem-per-cpu $memory
     944#SBATCH --exclusive
     945
     946module load PALMDependencies/.gcc
     947
     948$init_cmds
     949$module_calls
    955950
    956951%%END%%
     
    12881283    echo "trap '"                               >>  $job_to_send
    12891284    echo "set +vx"                              >>  $job_to_send
    1290     if [[ $(echo $remote_host | cut -c1-3) = ibm  ||  $remote_host = lcbullhh  ||  $remote_host = lccrayb  ||  $remote_host = lccrayh  ||  $(echo $remote_host | cut -c1-3) = nec  ||  $remote_host = lcflow  ||  $remote_host = lckiaps  ||  $remote_host = lckyu* || $remote_host = lcxe6  ||  $remote_host = lcocean ]]
     1285    if [[ $(echo $remote_host | cut -c1-3) = ibm  ||  $remote_host = lcbullhh  ||  $remote_host = lccrayb  ||  $remote_host = lccrayh  ||  $(echo $remote_host | cut -c1-3) = nec  ||  $remote_host = lckiaps  ||  $remote_host = lckyu* || $remote_host = lcxe6  ||  $remote_host = lcocean ]]
    12911286    then
    12921287       if [[ $remote_host = ibmh ]]
     
    14611456          echo "rm -f scpjob.${identifier}.tmp"                             >>  $job_to_send         
    14621457
    1463        elif [[ $remote_host = lcflow ]]
    1464        then
    1465           echo "cat > scpjob.${identifier}.tmp << %%END%%"                  >>  $job_to_send
    1466           echo "#!/bin/bash"                                             >>  $job_to_send
    1467           echo "SGEPREFIX -S /bin/bash"                                  >>  $job_to_send
    1468           echo "SGEPREFIX -N transfer_$job_name"                         >>  $job_to_send
    1469           echo "SGEPREFIX -cwd"                                          >>  $job_to_send
    1470           echo "SGEPREFIX -l h_rt=01:00:00"                              >>  $job_to_send
    1471           echo "SGEPREFIX -l h_vmem=500M"                                >>  $job_to_send
    1472           echo "SGEPREFIX -j y"                                          >>  $job_to_send
    1473           echo "SGEPREFIX -o ${local_host}_${job_name}_scpjob_$identifier"  >>  $job_to_send
    1474           echo " "                                                       >>  $job_to_send
    1475           echo "set -x"                                                  >>  $job_to_send
    1476           echo "export PALM_BIN=$PALM_BIN" | sed -e 's:'$HOME':$HOME:'   >>  $job_to_send
    1477           echo "export PATH=\$PATH:\$PALM_BIN"                           >>  $job_to_send
    1478           echo ""                                 >>  $job_to_send         
    1479           echo "batch_scp  $PORTOPT  -d  -w 10  -u $local_user $local_address  ${job_catalog}/$remote_dayfile  \"$job_catalog\"  $local_dayfile"  >>  $job_to_send
    1480           echo "[[ \"\$for_subjob_to_do\" != \"\" ]]  &&  eval \$for_subjob_to_do"  >>  $job_to_send
    1481           echo "rm -f scpjob.${identifier}"                                 >>  $job_to_send         
    1482           echo "%%END%%"                                                 >>  $job_to_send
    1483           echo "sed -e 's/SGEPREFIX/#$/g' scpjob.${identifier}.tmp > scpjob.${identifier}" >>  $job_to_send         
    1484           echo "rm -f scpjob.${identifier}.tmp"                             >>  $job_to_send         
    14851458       elif [[ $remote_host = lcxe6 ]]
    14861459       then
     
    15491522          echo "scp $PORTOPT scpjob.$identifier  ${remote_username}@${remote_address}:job_queue"           >>  $job_to_send
    15501523          echo "ssh $SSH_PORTOPT ${remote_username}@${remote_address}  \"cd job_queue; $submcom scpjob.$identifier; rm scpjob.$identifier\" "  >>  $job_to_send
    1551        elif [[ $remote_host = lcflow  ||  $remote_host = lcocean ]]
     1524       elif [[ $remote_host = lcocean ]]
    15521525       then
    15531526          echo "mv  scpjob.$identifier  $job_catalog"           >>  $job_to_send
     
    15851558
    15861559    # REMOVE JOB-FILE
    1587  if [[ $remote_host = lctit  ||  $remote_host = ibmku  ||  $remote_host = lcflow ]]
     1560 if [[ $remote_host = lctit  ||  $remote_host = ibmku ]]
    15881561 then
    15891562    echo " "                               >>  $job_to_send
     
    16381611       then
    16391612          ssh  $SSH_PORTOPT $remote_address  -l $remote_user  "cd $job_catalog; $submcom $job_on_remhost"
    1640        elif [[ $remote_host = lcflow ]]
    1641        then
    1642           /usr/bin/ssh  $SSH_PORTOPT $remote_address  -l $remote_user  "$init_cmds $module_calls cd $job_catalog; $submcom $job_on_remhost"
    16431613       else
    16441614          ssh  $ssh_key  $SSH_PORTOPT $remote_address  -l $remote_user  "cd $job_catalog; $submcom $job_on_remhost; rm $job_on_remhost"
     
    16481618    else
    16491619       cd  $job_catalog
    1650        if [[ $(echo $local_host | cut -c1-3) = ibm  ||  $(echo $local_host | cut -c1-6) = lccray ]]
     1620       if [[ $(echo $local_host | cut -c1-3) = ibm  ||  $(echo $local_host | cut -c1-6) = lccray || $local_host = lceddy ]]
    16511621       then
    16521622          eval  $submcom  $job_on_remhost
     
    16731643       fi
    16741644
    1675           # JOBFILE MUST NOT BE DELETED ON lctit/ibmku/lcflow. THIS WILL BE DONE
     1645          # JOBFILE MUST NOT BE DELETED ON lctit/ibmku. THIS WILL BE DONE
    16761646          # AT THE END OF THE JOB
    1677        if [[ $local_host != lctit  &&  $local_host != ibmku  &&  $local_host != lcflow ]]
     1647       if [[ $local_host != lctit  &&  $local_host != ibmku ]]
    16781648       then
    16791649          rm  $job_on_remhost
  • palm/trunk/SOURCE/wind_turbine_model_mod.f90

    r2233 r2257  
    1515! PALM. If not, see <http://www.gnu.org/licenses/>.
    1616!
     17! Copyright 2009-2017 Carl von Ossietzky Universitaet Oldenburg
    1718! Copyright 1997-2017 Leibniz Universitaet Hannover
    1819!------------------------------------------------------------------------------!
     
    2526! -----------------
    2627! $Id$
     28! Bugfix: turb_cl_tab and turb_cd_tab were set to zero before being allocated
     29!
     30! 2233 2017-05-30 18:08:54Z suehring
    2731!
    2832! 2232 2017-05-30 17:47:52Z suehring
     
    676680       roty(:,:)                = 0.0_wp
    677681       rotz(:,:)                = 0.0_wp
    678        turb_cl_tab(:,:)         = 0.0_wp
    679        turb_cd_tab(:,:)         = 0.0_wp
    680682
    681683       nac_cd_surf(:,:,:)       = 0.0_wp
Note: See TracChangeset for help on using the changeset viewer.