Changeset 5512 for CONFIG

Timestamp:

11/28/20 14:20:21 (3 years ago)

Author:

aclsce

Message:

Add some coherence between experiments (piControl and pdControl) and resolutions (LR, MR1, MR025).

Location:

CONFIG/UNIFORM/v6/IPSLCM6.2/GENERAL

Files:

• DRIVER/opa9.driver (modified) (1 diff)
• PARAM/namelist_ORCA025_cfg (modified) (1 diff)
• PARAM/namelist_ORCA1_cfg (modified) (1 diff)
• PARAM/namelist_ORCA1_cfg_IPSLCM6-MR1 (deleted)

CONFIG/UNIFORM/v6/IPSLCM6.2/GENERAL/DRIVER/opa9.driver

@@ -227 +227 @@
     IGCM_comp_modifyNamelist nonblocker namelist_cfg nn_rnf_depth_file  ${OPA_NMSH}
     IGCM_comp_modifyNamelist blocker    namelist_cfg nn_leapy     ${OPA_NLEAPY}
-    
+
+    # Domain decomposition : use of value in opa9.card or DEFAULT value. 
+
+    if [ ! X${opa9_UserChoices_Nproc_ni} = X ] ; then
+       IGCM_comp_modifyNamelist nonblocker namelist_cfg jpi ${opa9_UserChoices_Nproc_ni}
+    else
+        IGCM_comp_modifyNamelist nonblocker namelist_cfg jpi DEFAULT
+    fi
+    if [ ! X${opa9_UserChoices_Nproc_nj} = X ] ; then
+       IGCM_comp_modifyNamelist nonblocker namelist_cfg jpj ${opa9_UserChoices_Nproc_nj}
+    else
+        IGCM_comp_modifyNamelist nonblocker namelist_cfg jpj DEFAULT
+    fi
+    if [ ! X${opa9_UserChoices_Total_nproc} = X ] ; then
+       IGCM_comp_modifyNamelist nonblocker namelist_cfg jpij ${opa9_UserChoices_Total_nproc}
+    else
+        IGCM_comp_modifyNamelist nonblocker namelist_cfg jpij DEFAULT
+    fi
+
     # Update iodef.xml
 

CONFIG/UNIFORM/v6/IPSLCM6.2/GENERAL/PARAM/namelist_ORCA025_cfg

@@ -377 +377 @@
 !-----------------------------------------------------------------------
    ln_nnogather=  .true.   !
-    jpni        =   85      !  jpni   number of processors following i (set automatically if < 1)
-    jpnj        =   47      !  jpnj   number of processors following j (set automatically if < 1)
-    jpnij       =  2489     !  jpnij  number of local domains (set automatically if < 1)
+   jpni        =  _AUTO_: DEFAULT=86      !  jpni   number of processors following i (set automatically if < 1)
+   jpnj        =  _AUTO_: DEFAULT=58      !  jpnj   number of processors following j (set automatically if < 1)
+   jpnij       =  _AUTO_: DEFAULT=3064     !  jpnij  number of local domains (set automatically if < 1)
 /
 !-----------------------------------------------------------------------

CONFIG/UNIFORM/v6/IPSLCM6.2/GENERAL/PARAM/namelist_ORCA1_cfg

@@ -407 +407 @@
 !-----------------------------------------------------------------------
    ln_nnogather=  .true.   !
-   jpni        =   22      !  jpni   number of processors following i (set automatically if < 1)
-   jpnj        =   22      !  jpnj   number of processors following j (set automatically if < 1)
-   jpnij       =  360      !  jpnij  number of local domains (set automatically if < 1), 360 for eORCA1/IPSLCM6-LR
+   jpni        =  _AUTO_: DEFAULT=22      !  jpni   number of processors following i (set automatically if < 1)
+   jpnj        =  _AUTO_: DEFAULT=22      !  jpnj   number of processors following j (set automatically if < 1)
+   jpnij       =  _AUTO_: DEFAULT=360     !  jpnij  number of local domains (set automatically if < 1), 360 for eORCA1/IPSLCM6-LR
 /
 !-----------------------------------------------------------------------