Changeset 2954 for CONFIG/UNIFORM/v6/LMDZORINCA_v6/GENERAL/DRIVER/lmdz.driver

Timestamp:

08/01/16 12:14:02 (8 years ago)

Author:

acosce

Message:

Homogenization of card between LMDZORINCA_v6 and LDMZOR_v6
+ add new config NMHC in LMDZORINCA_v6
+ compilation with XIOS2
+ add new resolution for LMDZORINCA_v6 (144x142x79 AER)

File:

• CONFIG/UNIFORM/v6/LMDZORINCA_v6/GENERAL/DRIVER/lmdz.driver (modified) (2 diffs)

CONFIG/UNIFORM/v6/LMDZORINCA_v6/GENERAL/DRIVER/lmdz.driver

@@ -435 +435 @@
     fi 
 
+    # config.def : Activate COSP
+    if [ ! X${lmdz_UserChoices_LMDZ_COSP_OK} = X ]; then 
+        IGCM_comp_modifyDefFile nonblocker config.def ok_cosp ${lmdz_UserChoices_LMDZ_COSP_OK}
+    else
+        IGCM_comp_modifyDefFile nonblocker config.def ok_cosp n 
+    fi 
+
+    # config.def : Modify parameter pmagic if it is set in lmdz.card
+    if [ ! X${lmdz_UserChoices_pmagic} = X ]; then 
+        IGCM_comp_modifyDefFile nonblocker config.def pmagic ${lmdz_UserChoices_pmagic}
+    else
+        # Take default value set in config.def
+        IGCM_comp_modifyDefFile nonblocker config.def pmagic DEFAULT
+    fi 
+
     # guide.def : Activate nudging if ok_guide=y set in lmdz.card
     if [ ! X${lmdz_UserChoices_ok_guide} = X ] ; then
@@ -468 +483 @@
     fi
 
-    if [ X${lmdz_UserChoices_XIOS}  = Xy ] ; then
-        # Add include of LMDZ context in iodef.xml
-        # In iodef.xml add on next line after "COMPONENT CONTEXT"
-        #  <context id="LMDZ" src="./context_lmdz.xml"/>
-        echo '<context id="LMDZ" src="./context_lmdz.xml"/>' > add.tmp
-        cp iodef.xml iodef.xml.tmp
-        sed -e "/COMPONENT CONTEXT/r add.tmp" iodef.xml.tmp > iodef.xml
-        rm iodef.xml.tmp add.tmp
-
-        #Long Name as global attribute (if LongName is not empty)
-        if [ ! "X${config_UserChoices_LongName}" = "X" ] ; then
-            listfile=$(ls file_def*lmdz.xml)
-            echo "<variable id=\"LongName\" type=\"string\">${config_UserChoices_LongName}</variable>" > add.tmp
-            for file in ${listfile}
-            do
-                cp ${file} ${file}.tmp
-                sed -e "/<file id/r add.tmp" \
-                    ${file}.tmp > ${file}
-                rm ${file}.tmp 
-            done
-            rm add.tmp
-        fi
-
-        # Set ok_all_xml=y in run.def
-        IGCM_comp_modifyDefFile nonblocker run.def ok_all_xml y
-    else
-        # Deactivate ok_all_xml in run.def
-        IGCM_comp_modifyDefFile nonblocker run.def ok_all_xml n
-    fi
-    
+    # Add include of LMDZ context in iodef.xml
+    # In iodef.xml add on next line after "COMPONENT CONTEXT"
+    #  <context id="LMDZ" src="./context_lmdz.xml"/>
+    echo '<context id="LMDZ" src="./context_lmdz.xml"/>' > add.tmp
+    cp iodef.xml iodef.xml.tmp
+    sed -e "/COMPONENT CONTEXT/r add.tmp" iodef.xml.tmp > iodef.xml
+    rm iodef.xml.tmp add.tmp
+
+    #Long Name as global attribute (if LongName is not empty)
+    if [ ! "X${config_UserChoices_LongName}" = "X" ] ; then
+        listfile=$(ls file_def*lmdz.xml)
+        echo "<variable id=\"LongName\" type=\"string\">${config_UserChoices_LongName}</variable>" > add.tmp
+        for file in ${listfile}
+        do
+            cp ${file} ${file}.tmp
+            sed -e "/<file id/r add.tmp" \
+                ${file}.tmp > ${file}
+            rm ${file}.tmp 
+        done
+        rm add.tmp
+    fi
+            
     IGCM_debug_PopStack "ATM_Update"
 }