Changeset 2267

Timestamp:

07/01/14 17:40:21 (10 years ago)

Author:

omamce

Message:

O.M.

Add management of coupling frequency. Default is 86400s.
LMDZ is not managed up to now

Location:

CONFIG/UNIFORM/v6/IPSLCM6

Files:

• EXPERIMENTS/IPSLCM/piControl/COMP/oasis.card (modified) (2 diffs)
• EXPERIMENTS/IPSLCM/piControl/COMP/opa9.card (modified) (3 diffs)
• GENERAL/DRIVER/oasis.driver (modified) (2 diffs)
• GENERAL/DRIVER/opa9.driver (modified) (8 diffs)

CONFIG/UNIFORM/v6/IPSLCM6/EXPERIMENTS/IPSLCM/piControl/COMP/oasis.card

@@ -4 +4 @@
 [UserChoices]
 OutputMode=y
+FreqCoupling=86400
 
 [InitialStateFiles]
@@ -30 +31 @@
 
 [OutputText]
-List=   (namcouple)
+List=   (namcouple, lucia, oasis_balance.eps)
 
 [OutputFiles]

CONFIG/UNIFORM/v6/IPSLCM6/EXPERIMENTS/IPSLCM/piControl/COMP/opa9.card

@@ -3 +3 @@
 
 [UserChoices]
-OPA_NPDT_JOURS=15
-ORCA_version=ORCA2.3
+ORCA_version=ORCA1.0
 io_xml=y
 mesh_mask=n
@@ -18 +17 @@
 List=   ()
 ListNonDel= (${R_BC}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_ORCA_version}/ahmcoef,        .), \
-            (${R_BC}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_ORCA_version}/bathy_level.nc, .), \
             (${R_BC}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_ORCA_version}/bathy_meter.nc, .), \
             (${R_BC}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_ORCA_version}/coordinates.nc, .), \
@@ -46 +44 @@
 
 [OutputText]
-List=   (ocean.output, solver.stat, namelist, iodef.xml, field_def.xml, domain_def.xml, xmlio_server.def)
+List=   (ocean.output, solver.stat, namelist, iodef.xml, field_def.xml, domain_def.xml, xmlio_server.def, out_opa.xx.out, out_opa.xx.err)
 #List=   (ocean.output, oceanx.prt, solver.stat)
 

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

@@ -61 +61 @@
     (( LagAtm = 86400 / day_step * iphysiq / nsplit_phys ))
 
-    (( LagOce = 86400 / opa9_UserChoices_OPA_NPDT_JOURS ))
+    (( LagOce = 86400 / ORCA_NPDT_JOUR ))
 
     ############ Update Parameter Files   ##############
@@ -93 +93 @@
     fi
 
+    /ccc/scratch/cont003/dsm/p86caub/LUCIA/lucia
+
     echo FINALIZE CPL !!!
 

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

@@ -28 +28 @@
     echo "LIM_VERSION    : ${LIM_VERSION}"
     echo "RESOL_OCE      : ${RESOL_OCE}"
-
-    ORCA_NPDT_JOUR=${opa9_UserChoices_OPA_NPDT_JOURS:=15}
 
     # Local function to find namelists parameters
@@ -55 +53 @@
 
     NAMELIST_OPA_CFG=${SUBMIT_DIR}/PARAM/namelist_${RESOL_OCE}_cfg
+    NAMELIST_OPA_REF=${SUBMIT_DIR}/PARAM/namelist_${RESOL_OCE}_ref
+    echo "namelist_ref : ${NAMELIST_OPA_REF}"
+    if [ ! -r ${NAMELIST_OPA_REF} ] ; then
+        echo "${NAMELIST_OPA_REF} non trouve"
+    fi
     echo "namelist_cfg : ${NAMELIST_OPA_CFG}"
     if [ ! -r ${NAMELIST_OPA_CFG} ] ; then
@@ -74 +77 @@
     PAT_ICE_EMBD=$( supergrep nn_ice_embd ${NAMELIST_OPA_CFG} )
     PAT_ICEFLX=$(   supergrep cn_iceflx   ${NAMELIST_OPA_CFG} )
-
-    ORCA_RDT=$(   supergrep rn_rdt        ${NAMELIST_OPA_CFG} | sed 's/ *rn_rdt *=//' | sed 's/\. *//' )
+    PAT_JPNI=$(     supergrep jpni        ${NAMELIST_OPA_CFG} )
+    PAT_JPNJ=$(     supergrep jpnj        ${NAMELIST_OPA_CFG} )
+    PAT_JPNIJ=$(    supergrep jpnij       ${NAMELIST_OPA_CFG} )
+    PAT_NN_FSBC=$(  supergrep nn_fsbc     ${NAMELIST_OPA_CFG} ) 
+
+    ORCA_RDT=$(       supergrep rn_rdt        ${NAMELIST_OPA_CFG} | sed 's/ *rn_rdt *=//'  | sed 's/\. *//' )
+    ORCA_NN_FSBC=$(   supergrep nn_fsbc       ${NAMELIST_OPA_CFG} | sed 's/ *nn_fsbc *=//' | sed 's/\. *//' )
+    (( ORCA_NPDT_JOUR  = 86400 / ORCA_RDT     ))
+    (( ORCA_NPDT_SBC   = ORCA_NPDT_JOUR / ORCA_NN_FSBC ))
+ 
 
     # Period Length In Days between DateBegin and first day of calendar 0001 01 01
@@ -95 +106 @@
     echo "PAT_ICE_EMBD $PAT_ICE_EMBD"
     echo "PAT_ICEFLX   $PAT_ICEFLX"
+    echo "PAT_JPNI     $PAT_JPNI"
+    echo "PAT_JPNJ     $PAT_JPNJ"
+    echo "PAT_JPNIJ    $PAT_JPNIJ"
+    echo "PAT_NN_FSBC  $PAT_NN_FSBC"
+    echo " "
     echo "ORCA_RDT     $ORCA_RDT"
     echo "DaysSinceJC  $DaysSinceJC"
-
+    
     IGCM_debug_PopStack "OCE_Initialize"
 
@@ -108 +124 @@
     IGCM_debug_PushStack "OCE_Update"
 
+    ## Check that nn_fsbc is correct compare to coupling frequency
+
+    FreqCoupling=${oasis_UserChoices_FreqCoupling:-86400}
+    if [[ ${FreqCoupling} -gt 0 ]] ; then
+        (( ORCA_NPDT_COUP  = 86400 / FreqCoupling ))
+    else
+        ORCA_NPDT_COUP=${ORCA_NPDT_SBC}
+    fi 
+    
+    if [[ ${ORCA_NN_FSBC} -lt ${ORCA_NPDT_COUP} ]] ; then
+        (( ORCA_NN_FSBC = ORCA_NPDT_JOUR / ORCA_NPDT_COUP ))
+    fi
+
     ## This informations are used for diaptr, trends and diagap files
     ## only the first frequency is used for this files
+   
+
+    echo "FreqCoupling    $FreqCoupling"
+    echo "ORCA_NN_FSBC    $ORCA_NN_FSBC"
+    echo "ORCA_NPDT_JOUR  $ORCA_NPDT_JOUR"
+    echo "ORCA_NPDT_COUP  $ORCA_NPDT_COUP"
+    echo "ORCA_NPDT_SBC   $ORCA_NPDT_SBC"
 
     ##--Write Frequency Purpose ....
@@ -171 +207 @@
     ORCA_NSTOCK="${ORCA_NITEND}"
 
-    ##-- Let verify the number of time steps per day
-    (( NB_SEC_JOUR_MODEL = ORCA_NPDT_JOUR * ORCA_RDT ))
-    (( NB_SEC_JOUR = 60 * 60 * 24 ))
-
-    if [ ${NB_SEC_JOUR_MODEL} -ne ${NB_SEC_JOUR} ] ; then
-        echo " VERIFY ORCA_NPDT_JOUR in opa9.card "
-        exit
-    fi
-
     ##-- Restart configuration
     if ( [ "${CumulPeriod}" -eq 1 ] && [ "${config_OCE_Restart}" = "n" ] ) ; then
@@ -234 +261 @@
     esac
 
+    echo "NUM_PROC_OCE : " ${NUM_PROC_OCE}
+
     sed -e "s/${PAT_CEXPER}/       cn_exp=\"${config_UserChoices_JobName}\"/"   \
         -e "s/${PAT_NIT000}/       nn_it000=${ORCA_NIT000}/"                    \
@@ -246 +275 @@
         -e "s/${PAT_NN_WRITE}/     nn_prg=${ORCA_NWRITE}/"                      \
         -e "s/${PAT_NN_FWRI}/      nn_fwri=${ORCA_NWRITE}/"                     \
+        -e "s/${PAT_NN_FSBC}/      nn_fsbc=${ORCA_NN_FSBC}/"                    \
         -e "s/${PAT_ICE_EMBD}/     nn_ice_embd=${NN_ICE_EMBD}/"                 \
         -e "s/${PAT_ICEFLX}/       cn_iceflx=\'${ICEFLX}'/"                     \
+        -e "s/${PAT_JPNI}/         jpni=1/"                                     \
+        -e "s/${PAT_JPNJ}/         jpnj=${NUM_PROC_OCE}/"                       \
+        -e "s/${PAT_JPNIJ}/        jpnij=${NUM_PROC_OCE}/"                      \
         namelist_cfg > namelist_cfg.tmp