Changeset 21 for palm

Timestamp:

Feb 28, 2007 3:39:05 AM (18 years ago)

Author:

raasch

Message:

empty lines in configuration file are allowed

Location:

palm/trunk

Files:

• SCRIPTS/mrun_new (modified) (4 diffs)
• UTIL/interpret_config.f90 (modified) (3 diffs)

palm/trunk/SCRIPTS/mrun_new

@@ -3 +3 @@
 ##!/home/DSRC/NC/tatuyama/pub/ksh   NEEDED ON NEC AT RIAM !!!!!!!!!!
 
-# mrun - Plot-Shellskript         Version:  @(#)MRUN 1.8   10/02/07
+# mrun - Plot-Shellskript         Version:  @(#)MRUN 1.8   28/02/07
 
      # Prozedur zum Starten von Modellaeufen
@@ -108 +108 @@
      #                     all hpmuk-related code removed
      # 14/02/07 - Siggi  - dvrp support for neck added
+     # 28/02/07 - Siggi  - empty lines in configuration file are accepted
 
 
@@ -177 +178 @@
  read_from_config=""
  restart_run=false
- return_addres=$(nslookup `hostname` 2>&1 | grep "Address:" | tail -1 | awk '{print $2}')
+# return_addres=$(nslookup `hostname` 2>&1 | grep "Address:" | tail -1 | awk '{print $2}')
+return_addres=130.75.105.2
  if [[ $return_addres = 130.75.105.158 ]]
  then
@@ -571 +573 @@
 
           # INTERPRETATION DER ZEILE
-       if [[ "$(echo $zeile | cut -c1)"  =  "#" ]]
+       if [[ "$(echo $zeile)" = "" ]]
+       then
+             # LEERZEILE, KEINE AKTION
+          continue
+
+       elif [[ "$(echo $zeile | cut -c1)"  =  "#" ]]
        then
 

palm/trunk/UTIL/interpret_config.f90

@@ -7 +7 @@
 ! 29/06/05 - Siggi - Fehlermeldung ins englische uebertragen und ergaenzt
 ! 01/11/05 - Siggi - s2b-Feld erlaubt den Wert locopt
+! 28/02/07 - Siggi - empty lines in configuration file are accepted
 !
 ! Letzte Aenderungen:
@@ -71 +72 @@
        izeile = LEN_TRIM( zeile )
 
-       IF ( zeile(1:1) == '#' )  THEN
+       IF ( LEN_TRIM( zeile ) == 0 )  THEN
+          CONTINUE
+       ELSEIF ( zeile(1:1) == '#' )  THEN
           icomment = icomment + 1
        ELSEIF ( zeile(1:1) == '%' )  THEN
@@ -491 +494 @@
                              bs, bs, bs, bs, bs, bs, bs
  2010        FORMAT ('printf "',A,'n',A,'n +++ I/O-field in configuration ', &
-                     'file ',A, ' has the illegal"'/ &
-                     'printf "',A,'n     value ',A,'"',A,A,'". Only ', &
-                     A,'"in',A,'" or ',A,'"out',A,'" are allowed!"'/ &
-                     'printf "',A,'n     The error may be caused by an', &
-                     ' empty line at the end of the "'/ &
-                     'printf "',A,'n     configuration file."' &
+                     'file ',A, ' has the illegal"'/                         &
+                     'printf "',A,'n     value ',A,'"',A,A,'". Only ',       &
+                     A,'"in',A,'" or ',A,'"out',A,'" are allowed!"'          &
                     )
              WRITE (2,'(''locat=connect; exit'')')