Changeset 2606

Timestamp:

07/07/15 11:52:36 (9 years ago)

Author:

jgipsl

Message:

Removed modifications from xios.driver and set correct behaviour in iodef.xml. This modification could now be done because XIOS is now mandatory in coupled mode.

Location:

CONFIG/UNIFORM/v6

Files:

• IPSLCM6/GENERAL/DRIVER/xios.driver (modified) (1 diff)
• IPSLCM6/GENERAL/PARAM/iodef.xml (modified) (1 diff)
• LMDZOR_v6/GENERAL/DRIVER/xios.driver (modified) (1 diff)
• LMDZOR_v6/GENERAL/PARAM/iodef.xml (modified) (1 diff)

CONFIG/UNIFORM/v6/IPSLCM6/GENERAL/DRIVER/xios.driver

@@ -18 +18 @@
 # Activate server mode
     IGCM_comp_modifyXmlFile force iodef.xml using_server NONE true
-# If lmdz_UserChoices_XIOS=y add LMDZ as component id :
-    if [ X${lmdz_UserChoices_XIOS}  = Xy ] ; then
-        IGCM_comp_modifyXmlFile force iodef.xml oasis_codes_id NONE LMDZ,oceanx
-    fi 
+
     if [ -f namcouple ] ; then
         sed -e "s/2  LMDZ oceanx/3 LMDZ oceanx ${config_Executable_IOS[1]}/" namcouple > namcouple.tmp 

CONFIG/UNIFORM/v6/IPSLCM6/GENERAL/PARAM/iodef.xml

@@ -21 +21 @@
           <variable id="using_server"              type="boolean">false</variable>
           <variable id="using_oasis"               type="boolean">false</variable>
-          <variable id="oasis_codes_id"            type="string" >oceanx</variable>
+          <variable id="oasis_codes_id"            type="string" >LMDZ,oceanx</variable>
         
       </variable_definition>

CONFIG/UNIFORM/v6/LMDZOR_v6/GENERAL/DRIVER/xios.driver

@@ -18 +18 @@
 # Activate server mode
     IGCM_comp_modifyXmlFile force iodef.xml using_server NONE true
-# If lmdz_UserChoices_XIOS=y add LMDZ as component id :
-    if [ X${lmdz_UserChoices_XIOS}  = Xy ] ; then
-        IGCM_comp_modifyXmlFile force iodef.xml oasis_codes_id NONE LMDZ,oceanx
-    fi 
+
     if [ -f namcouple ] ; then
         sed -e "s/2  LMDZ oceanx/3 LMDZ oceanx ${config_Executable_IOS[1]}/" namcouple > namcouple.tmp 

CONFIG/UNIFORM/v6/LMDZOR_v6/GENERAL/PARAM/iodef.xml

@@ -21 +21 @@
           <variable id="using_server"              type="boolean">false</variable>
           <variable id="using_oasis"               type="boolean">false</variable>
-          <variable id="oasis_codes_id"            type="string" >oceanx</variable>
+          <variable id="oasis_codes_id"            type="string" >LMDZ,oceanx</variable>
         
       </variable_definition>