Changeset 27


Ignore:
Timestamp:
Feb 28, 2007 11:03:00 AM (15 years ago)
Author:
raasch
Message:

Bugfixes in mrun and mbuild

Location:
palm/trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • palm/trunk/SCRIPTS/mbuild

    r25 r27  
    7979     # 07/02/07 - Siggi - adapted for RIAM (neck)
    8080     # 10/02/07 - Siggi - all hpmuk-related code removed
    81      # 28/02/07 - Siggi - compilation of utility programs added (option -u)
     81     # 28/02/07 - Siggi - compilation of utility programs and transfer of
     82     #                    scripts to remote hosts added (option -u)
    8283
    8384
     
    810811
    811812
     813       # BEI BENUTZUNG EINES PARALLELEN COMPILERS MUSS AUCH EIN
     814       # SERIELLER COMPILERNAME ERMITTELT WERDEN
     815    if [[ $(echo $remote_host_string | grep -c parallel) = 1 ]]
     816    then
     817       line=""
     818       grep  "$remote_host_string" $config_file | grep "%compiler_name_ser"  |  while read line1
     819       do
     820          if [[ $(echo $line1 | cut -d" " -s -f3-) = "$remote_host_string" ]]
     821          then
     822             line="$line1"
     823          fi
     824       done
     825
     826       if [[ "$line" = ""  ||  $(echo $line | cut -c1) = "#" ]]
     827       then
     828          printf "\n  +++ no seriel compiler name found in configuration file"
     829          printf "\n      for \"$remote_host_string\" "
     830          locat=config_file; exit
     831       else
     832          compiler_name_ser=`echo $line | cut -d" " -s -f2`
     833       fi
     834    else
     835       compiler_name_ser=$compiler_name
     836    fi
     837
     838
    812839
    813840       # PRAEPROZESSOR-DIREKTIVEN SETZEN
     
    12411268
    12421269             printf "\n\n"
    1243              echo "  *** copying utility programs to \"${remote_addres}:${remote_ud}/\" "
    1244              cd  ${local_source_path}/../UTIL
     1270             echo "  *** copying scripts and utility programs to \"${remote_addres}:${remote_ud}/\" "
     1271             cd  ${local_source_path}/../SCRIPTS
    12451272
    12461273             if [[ $remote_host != lctit ]]
     
    12531280             fi
    12541281
     1282                # KOPIEREN DER SCRIPTE
     1283             if [[ $local_host = decalpha ]]
     1284             then
     1285                   # DECALPHA BENUTZT BEI NICHTANGABE DES VOLLSTÄNDIGEN PFADES
     1286                   # IRGENDEIN ANDERES SCP (WAS NICHT FUNKTIONIERT). AUSSERDEM
     1287                   # KOENNEN DOLLAR-ZEICHEN NICHT BENUTZT WERDEN
     1288                remote_ud=`echo $remote_ud | sed 's/\$HOME\///'`
     1289                /bin/scp  batch_scp mbuild mrun subjob  ${remote_username}@${remote_addres}:${remote_ud}/../SCRIPTS  >  /dev/null
     1290             else
     1291                scp  Makefile  *.f90  ${remote_username}@${remote_addres}:${remote_ud}/../SCRIPTS  >  /dev/null
     1292             fi
     1293
     1294             cd  -  > /dev/null
     1295             cd  ${local_source_path}/../UTIL
     1296
     1297
     1298                # KOPIEREN DER UTILITY-PROGRAMME
    12551299             if [[ $local_host = decalpha ]]
    12561300             then
     
    12741318             if [[ $remote_host = nech ]]
    12751319             then
    1276                 make_call_string="sxmake  F90=$compiler_name  COPT=\"$cpp_options\"  F90FLAGS=\"$compiler_options\"  LDFLAGS=\"$loader_options\" "
     1320                make_call_string="sxmake  F90=$compiler_name  F90_SER=$compiler_name_ser  COPT=\"$cpp_options\"  F90FLAGS=\"$compiler_options\"  LDFLAGS=\"$loader_options\" "
    12771321             else
    1278                 make_call_string="make  F90=$compiler_name  COPT=\"$cpp_options\"  F90FLAGS=\"$compiler_options\"  LDFLAGS=\"$loader_options\" "
     1322                make_call_string="make  F90=$compiler_name  F90_SER=$compiler_name_ser  COPT=\"$cpp_options\"  F90FLAGS=\"$compiler_options\"  LDFLAGS=\"$loader_options\" "
    12791323             fi
    12801324
  • palm/trunk/SCRIPTS/mrun

    r26 r27  
    180180 read_from_config=""
    181181 restart_run=false
    182 # return_addres=$(nslookup `hostname` 2>&1 | grep "Address:" | tail -1 | awk '{print $2}')
    183 return_addres=130.75.105.2
     182 return_addres=$(nslookup `hostname` 2>&1 | grep "Address:" | tail -1 | awk '{print $2}')
    184183 if [[ $return_addres = 130.75.105.158 ]]
    185184 then
  • palm/trunk/UTIL/Makefile

    r22 r27  
    2525
    2626F90 =
     27F90_SER =
    2728COPT =
    2829F90FLAGS =
     
    3536
    3637$(PROG1): $(OBJS1)
    37         $(F90) -o $(PROG1) $(OBJS1) $(LDFLAGS)
     38        $(F90_SER) -o $(PROG1) $(OBJS1) $(LDFLAGS)
    3839
    3940$(PROG2): $(OBJS2)
    40         $(F90) -o $(PROG2) $(OBJS2) $(LDFLAGS)
     41        $(F90_SER) -o $(PROG2) $(OBJS2) $(LDFLAGS)
    4142
    4243.f90.o:
    43         $(F90) $(F90FLAGS) $(COPT) -c $<
     44        $(F90_SER) $(F90FLAGS) $(COPT) -c $<
    4445
    4546
Note: See TracChangeset for help on using the changeset viewer.