Changeset 3961 for CONFIG/UNIFORM/v6/NEMO_v6/GENERAL/DRIVER

Timestamp:

07/03/18 11:41:59 (6 years ago)

Author:

cetlod

Message:

Consolidation of NEMO_v6 for OMIP

Location:

CONFIG/UNIFORM/v6/NEMO_v6/GENERAL/DRIVER

Files:

• opa9.driver (modified) (1 diff)
• pisces.driver (modified) (1 diff)
• xios.driver (modified) (1 diff)

CONFIG/UNIFORM/v6/NEMO_v6/GENERAL/DRIVER/opa9.driver

@@ -75 +75 @@
        (( year_forcing_p1 = ${year_forcing} + 1))
        (( i = 0 ))
-        while [ $i -lt ${NbFileInter} ] ; do
-           eval file=${opa9_UserChoices_ListForcing[$i]}
-           IGCM_sys_Get ${opa9_UserChoices_R_FORCING}/${file}_${year_forcing_m1}.nc  ${file}_y${year_m1}.nc
-           IGCM_sys_Get ${opa9_UserChoices_R_FORCING}/${file}_${year_forcing}.nc     ${file}_y${year}.nc
-           IGCM_sys_Get ${opa9_UserChoices_R_FORCING}/${file}_${year_forcing_p1}.nc  ${file}_y${year_p1}.nc
-           (( i = i + 1 ))
-        done
+       while [ $i -lt ${NbFileInter} ] ; do
+          eval file=${opa9_UserChoices_ListForcing[$i]}
+          IGCM_sys_Get ${opa9_UserChoices_R_FORCING}/${file}_${year_forcing_m1}.nc  ${file}_y${year_m1}.nc
+          IGCM_sys_Get ${opa9_UserChoices_R_FORCING}/${file}_${year_forcing}.nc     ${file}_y${year}.nc
+          IGCM_sys_Get ${opa9_UserChoices_R_FORCING}/${file}_${year_forcing_p1}.nc  ${file}_y${year_p1}.nc
+          (( i = i + 1 ))
+       done
+
+       if [ X"$( echo ${config_UserChoices_ExpType} | grep CMIP6 )" != "X" ] ; then
+          IGCM_sys_Get ${R_IN}/CMIP6/${config_UserChoices_LongName}/${config_UserChoices_ModelName}/${config_UserChoices_ExperimentName}/${config_UserChoices_Member}/${year_forcing}/dr2xml_nemo.xml  dr2xml_opa9.xml
+       fi
     fi
 

CONFIG/UNIFORM/v6/NEMO_v6/GENERAL/DRIVER/pisces.driver

@@ -172 +172 @@
    fi
 
+   if [ X"${pisces_UserChoices_Co2Anthr}" = X"y" ] ; then
+      LCO2INT=.TRUE.
+   else
+      LCO2INT=.FALSE.
+   fi
    ##-- Update namelist_top_cfg and namelist_pisces_cfg
     IGCM_comp_modifyNamelist blocker    namelist_top_cfg     ln_rsttr  ${TOP_LRSTTR}
     IGCM_comp_modifyNamelist blocker    namelist_top_cfg     nn_rsttr  ${TOP_NRSTTR}
+    IGCM_comp_modifyNamelist blocker    namelist_pisces_cfg  ln_co2int ${LCO2INT}
     IGCM_comp_modifyNamelist blocker    namelist_pisces_cfg  atcco2    ${pisces_UserChoices_AtmCo2}
+    IGCM_comp_modifyNamelist blocker    namelist_pisces_cfg  nrdttrc   ${pisces_UserChoices_PisFreq}
     IGCM_comp_modifyNamelist blocker    namelist_pisces_cfg  nn_pisdmp ${OPA_NPDT_YEAR}
-    IGCM_comp_modifyNamelist blocker    namelist_pisces_cfg  nrdttrc   ${pisces_UserChoices_PisFreq}
 
  

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

@@ -19 +19 @@
     IGCM_comp_modifyXmlFile force iodef.xml using_server NONE true
 
+    # Activate 2nd server level for CMIP6 type experiments (CMIP6 workflow)
+    if [ X"$( echo ${config_UserChoices_ExpType} | grep CMIP6 )" != "X" ] ; then
+       IGCM_comp_modifyXmlFile force iodef.xml using_server2 NONE true
+    fi
+
     IGCM_debug_PopStack "IOS_Update"
 }