Changeset 1081 for trunk/libIGCM/libIGCM_comp/libIGCM_comp.ksh

Timestamp:

10/07/14 12:27:21 (10 years ago)

Author:

jgipsl

Message:

Added option force in function IGCM_comp_modifyDefFile

File:

• trunk/libIGCM/libIGCM_comp/libIGCM_comp.ksh (modified) (4 diffs)

trunk/libIGCM/libIGCM_comp/libIGCM_comp.ksh

@@ -957 +957 @@
 #
 # Arguments:
-# - type   : first argument must be blocker or nonblocker.
+# - type   : first argument must be blocker, nonblocker or force
 #            For "blocker" case, the variable must be attributed the keyworld AUTO
 #            otherwise this function will exit.
 #            For "nonblocker" case, the user can remove or modify the variable. For
 #            this case, as long as AUTO is not set, no modification will be done.
+#            For "force" case, the variable will be modified even if it is not set to AUTO
 # - filein : the file in run directory of .def type in which the variable should be set
 # - key    : the variable to modify
@@ -984 +985 @@
   IGCM_debug_Print 1 "Entering IGCM_comp_modifyDefFile with arguments: $type $filein $key $value"
 
+
   # Test if first argument is correct
-  if [ $type != blocker ] && [ $type != nonblocker ] ; then
-    IGCM_debug_Exit "IGCM_comp_modifyDefFile: Error in first argument must be blocker or nonblocker"
+  if [ $type != blocker ] && [ $type != nonblocker ] && [ $type != force ] ; then
+    IGCM_debug_Exit "IGCM_comp_modifyDefFile: Error in first argument must be blocker, nonblocker or force"
     IGCM_debug_PopStack "IGCM_comp_modifyDefFile"
     return
@@ -1020 +1022 @@
     IGCM_debug_Print 1 "IGCM_comp_modifyDefFile: $key is not set in $filein. This is a nonblocker call so nothing is done."
     IGCM_debug_Print 1 "IGCM_comp_modifyDefFile: Default value for $key from the model will be used."
+    modify=no
   elif [ $( grep $key $filein | grep -v "\#"  |wc -l ) = 0 ] ; then
     # Variable key is not set in filein, stop.
     IGCM_debug_Exit "IGCM_comp_modifyDefFile : Variable $key is not set in correct file. It should be set in $filein."
+  fi
+  
+
+  # Check if AUTO is set in the filein on the same line as the key variable
+  if [ $( grep $key $filein | grep -v "\#" | grep AUTO | wc -l ) = 1 ] ; then
+      # Modification will be done for all cases
+      modify=yes
   else
-    # Read the value of key from filein
-    if [ X"$( grep $key $filein | grep -v "\#" | grep AUTO )" = "X" ] ; then
-      # The key variable is not set to AUTO
+      # The variable was not set to AUTO
       if [ $type = blocker ] ; then
-        # Stop because this is a blocker call
-        IGCM_debug_Exit "IGCM_comp_modifyDefFile : The variable $key cannot be modified. It should be set to AUTO."
-      else
-        # Do nothing. Suppose that the user did set the variable correct
-        IGCM_debug_Print 1 "IGCM_comp_modifyDefFile: $key is set by the user. Nothing done."
+          # Exit because this is a blocker call
+          IGCM_debug_Exit "IGCM_comp_modifyDefFile : The variable $key cannot be modified. It should be set to AUTO."
+          return
+       elif [ $type = nonblocker ] ; then
+          # Do nothing. Suppose that the user did set the variable correct
+          IGCM_debug_Print 1 "IGCM_comp_modifyDefFile: $key is set by the user. Nothing done."
+          modify=no
+       elif [ $type = force ] ; then
+          # Force modification
+          IGCM_debug_Print 1 "IGCM_comp_modifyDefFile : Variabl=$key was not set to AUTO. Modification will be forced."
+          modify=yes
       fi
-    else
-      # The variable key is set to AUTO.
+  fi
+
+  # Do the modifcation now
+  if [ $modify = yes ] ; then
 
       # For option DEFAULT, read default value from file.
@@ -1056 +1072 @@
       IGCM_debug_Print 1 "IGCM_comp_modifyDefFile: In $filein set $key=$value"
       \mv $filein.tmp $filein
-    fi
   fi
   IGCM_debug_PopStack "IGCM_comp_modifyDefFile"