Changeset 2663 for CONFIG/UNIFORM/v6/NEMO_v6

Timestamp:

10/29/15 15:53:38 (8 years ago)

Author:

cetlod

Message:

Minors corrections on NEMO_v6 configurations

Location:

CONFIG/UNIFORM/v6/NEMO_v6

Files:

• EXPERIMENTS/ORCA1_LIM3_PISCES/clim/COMP/opa9.card (modified) (1 diff)
• EXPERIMENTS/ORCA1_LIM3_PISCES/ia/COMP/opa9.card (modified) (1 diff)
• EXPERIMENTS/ORCA2_LIM2_PISCES/clim/COMP/opa9.card (modified) (1 diff)
• EXPERIMENTS/ORCA2_LIM3_PISCES/clim/COMP/opa9.card (modified) (1 diff)
• GENERAL/DRIVER/opa9.driver (modified) (2 diffs)
• GENERAL/PARAM/namelist_ORCA1_cfg (deleted)
• GENERAL/PARAM/namelist_ORCA1clim_cfg (added)
• GENERAL/PARAM/namelist_ORCA1ia_cfg (added)
• GENERAL/PARAM/namelist_ORCA2_cfg (deleted)
• GENERAL/PARAM/namelist_ORCA2clim_cfg (added)

CONFIG/UNIFORM/v6/NEMO_v6/EXPERIMENTS/ORCA1_LIM3_PISCES/clim/COMP/opa9.card

@@ -57 +57 @@
 [ParametersFiles]
 List=   (${SUBMIT_DIR}/PARAM/namelist_ref,        namelist_ref),   \
-        (${SUBMIT_DIR}/PARAM/namelist_${RESOL_OCE}_cfg,  namelist_cfg),   \
+        (${SUBMIT_DIR}/PARAM/namelist_${RESOL_OCE}${EXPTYPE}_cfg,  namelist_cfg),   \
         (${SUBMIT_DIR}/PARAM/domain_def.xml,      domain_def.xml), \
         (${SUBMIT_DIR}/PARAM/field_def.xml,       field_def.xml),  \

CONFIG/UNIFORM/v6/NEMO_v6/EXPERIMENTS/ORCA1_LIM3_PISCES/ia/COMP/opa9.card

@@ -63 +63 @@
 [ParametersFiles]
 List=   (${SUBMIT_DIR}/PARAM/namelist_ref,        namelist_ref),   \
-        (${SUBMIT_DIR}/PARAM/namelist_${RESOL_OCE}_cfg,  namelist_cfg),   \
+        (${SUBMIT_DIR}/PARAM/namelist_${RESOL_OCE}${EXPTYPE}_cfg,  namelist_cfg),   \
         (${SUBMIT_DIR}/PARAM/domain_def.xml,      domain_def.xml), \
         (${SUBMIT_DIR}/PARAM/field_def.xml,       field_def.xml),  \

CONFIG/UNIFORM/v6/NEMO_v6/EXPERIMENTS/ORCA2_LIM2_PISCES/clim/COMP/opa9.card

@@ -61 +61 @@
 [ParametersFiles]
 List=   (${SUBMIT_DIR}/PARAM/namelist_ref,        namelist_ref),   \
-        (${SUBMIT_DIR}/PARAM/namelist_${RESOL_OCE}_cfg,  namelist_cfg),   \
+        (${SUBMIT_DIR}/PARAM/namelist_${RESOL_OCE}${EXPTYPE}_cfg,  namelist_cfg),   \
         (${SUBMIT_DIR}/PARAM/domain_def.xml,      domain_def.xml), \
         (${SUBMIT_DIR}/PARAM/field_def.xml,       field_def.xml),  \

CONFIG/UNIFORM/v6/NEMO_v6/EXPERIMENTS/ORCA2_LIM3_PISCES/clim/COMP/opa9.card

@@ -62 +62 @@
 [ParametersFiles]
 List=   (${SUBMIT_DIR}/PARAM/namelist_ref             ,  namelist_ref),   \
-        (${SUBMIT_DIR}/PARAM/namelist_${RESOL_OCE}_cfg,  namelist_cfg),   \
+        (${SUBMIT_DIR}/PARAM/namelist_${RESOL_OCE}${EXPTYPE}_cfg,  namelist_cfg),   \
         (${SUBMIT_DIR}/PARAM/domain_def.xml,      domain_def.xml), \
         (${SUBMIT_DIR}/PARAM/field_def.xml,       field_def.xml),  \

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

@@ -6 +6 @@
 
     RESOL_OCE=$( echo ${config_UserChoices_ExperimentName} | cut -c1-5 )
+    EXPTYPE=$( echo ${config_UserChoices_ExperimentName} | cut -c6- )
 
 # Local function to find namelists parameters
@@ -12 +13 @@
 }
 
-    OPA_RDT=$( supergrep rn_rdt  ${SUBMIT_DIR}/PARAM/namelist_${RESOL_OCE}_cfg | sed 's/ *rn_rdt *=//' | sed 's/\. *,//' )
+    OPA_RDT=$( supergrep rn_rdt  ${SUBMIT_DIR}/PARAM/namelist_${RESOL_OCE}${EXPTYPE}_cfg | sed 's/ *rn_rdt *=//' | sed 's/\. *,//' )
 
     # Period Length In Days between DateBegin and first day of calendar 0001 01 01