Changeset 2117

Timestamp:

07/19/13 14:48:52 (10 years ago)

Author:

omamce

Message:

O.M.

• Add features for LIM3
• Add some flexibility towards diunal cycle

Location:

CONFIG/UNIFORM/v6/IPSLCM6/GENERAL/DRIVER

Files:

• oasis.driver (modified) (2 diffs)
• opa9.driver (modified) (5 diffs)

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

@@ -71 +71 @@
     fi
 
+    FreqCoupling=${oasis_UserChoices_FreqCoupling}
+
     ## Calculate lag for transfer of fields from atmosphere -> ocean.
-    ## LAG_ATM="1day in sec"/day_step * iphysiq/nsplit_phys
+    ## LagAtm="1day in sec"/day_step * iphysiq/nsplit_phys
     ## First get day_step, iphyisq and nsplit_phys from LMDZ parameter files
-    day_step=$( lmdzgrep day_step gcm.def )
-    iphysiq=$( lmdzgrep iphysiq gcm.def )
+    day_step=$(    lmdzgrep day_step gcm.def )
+    iphysiq=$(     lmdzgrep iphysiq gcm.def )
     nsplit_phys=$( lmdzgrep nsplit_phys physiq.def )
 
-    (( LAG_ATM = 86400 / day_step * iphysiq / nsplit_phys ))
+    (( LagAtm = 86400 / day_step * iphysiq / nsplit_phys ))
+
+    (( LagOce = 86400 / opa9_UserChoices_OPA_NPDT_JOURS ))
 
     ############ Update Parameter Files   ##############
@@ -88 +92 @@
         -e "s/<nproc_oce>/${NUM_PROC_OCE}/g" \
         -e "s/<output_mode>/${CPL_OutputVar}/g" \
-        -e "s/<lag_atm>/${LAG_ATM}/g" \
+        -e "s/<freq_coupling>/${FreqCoupling}/g" \
+        -e "s/<lag_atm>/${LagAtm}/g" \
+        -e "s/<lag_oce>/${LagOce}/g" \
         namcouple > namcouple.tmp
     IGCM_sys_Mv namcouple.tmp namcouple

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

@@ -6 +6 @@
 
     JOB_NAME=${config_UserChoices_JobName}
+
     RESOL_OCE_ICE=$( echo ${RESOL} | awk "-Fx" '{print $1}' )
     case ${RESOL_OCE_ICE} in
-        ( *LIM2*) SEAICE_MODEL=LIM2 ;;
-        ( *LIM3*) SEAICE_MODEL=LIM3 ;;
+        ( *LIM2* )
+        SEAICE_MODEL=LIM2 
+        LIM_VERSION=2
+        ;;
+        ( *LIM3* )
+        SEAICE_MODEL=LIM3
+        LIM_VERSION=3
+        ;;
         ( *CICE*) SEAICE_MODEL=CICE ;;
         ( *     ) SEAICE_MODEL=UNKNOWN ;;
@@ -18 +25 @@
     IGCM_debug_Print 1 "RESOL_OCE_ICE  : ${RESOL_OCE_ICE}"
     IGCM_debug_Print 1 "SEAICE_MODEL   : ${SEAICE_MODEL}"
+    IGCM_debug_Print 1 "LIM_VERSION    : ${LIM_VERSION}"
     IGCM_debug_Print 1 "RESOL_OCE      : ${RESOL_OCE}"
 
@@ -45 +53 @@
     # nf_ptr_wri frequency of zonal means and transport output
 
-    PAT_CEXPER=$( supergrep cn_exp     ${SUBMIT_DIR}/PARAM/namelist_${RESOL_OCE} )
-    PAT_NIT000=$( supergrep nn_it000   ${SUBMIT_DIR}/PARAM/namelist_${RESOL_OCE} )
-    PAT_NITEND=$( supergrep nn_itend   ${SUBMIT_DIR}/PARAM/namelist_${RESOL_OCE} )
-    PAT_NDATE0=$( supergrep nn_date0   ${SUBMIT_DIR}/PARAM/namelist_${RESOL_OCE} )
-    PAT_NLEAPY=$( supergrep nn_leapy   ${SUBMIT_DIR}/PARAM/namelist_${RESOL_OCE} )
-    PAT_NSTOCK=$( supergrep nn_stock   ${SUBMIT_DIR}/PARAM/namelist_${RESOL_OCE} )
-    PAT_NWRITE=$( supergrep nn_write   ${SUBMIT_DIR}/PARAM/namelist_${RESOL_OCE} )
-    PAT_RESTAR=$( supergrep ln_rstart  ${SUBMIT_DIR}/PARAM/namelist_${RESOL_OCE} )
-    PAT_NRSTAR=$( supergrep nn_rstctl  ${SUBMIT_DIR}/PARAM/namelist_${RESOL_OCE} )
-    PAT_NMSH=$(   supergrep nn_msh     ${SUBMIT_DIR}/PARAM/namelist_${RESOL_OCE} )
-    PAT_NPRG=$(   supergrep nn_prg     ${SUBMIT_DIR}/PARAM/namelist_${RESOL_OCE} )
-    PAT_NF_PTR=$( supergrep nf_ptr_wri ${SUBMIT_DIR}/PARAM/namelist_${RESOL_OCE} )
+    PAT_CEXPER=$(   supergrep cn_exp      ${SUBMIT_DIR}/PARAM/namelist_${RESOL_OCE} )
+    PAT_NIT000=$(   supergrep nn_it000    ${SUBMIT_DIR}/PARAM/namelist_${RESOL_OCE} )
+    PAT_NITEND=$(   supergrep nn_itend    ${SUBMIT_DIR}/PARAM/namelist_${RESOL_OCE} )
+    PAT_NDATE0=$(   supergrep nn_date0    ${SUBMIT_DIR}/PARAM/namelist_${RESOL_OCE} )
+    PAT_NLEAPY=$(   supergrep nn_leapy    ${SUBMIT_DIR}/PARAM/namelist_${RESOL_OCE} )
+    PAT_NSTOCK=$(   supergrep nn_stock    ${SUBMIT_DIR}/PARAM/namelist_${RESOL_OCE} )
+    PAT_NWRITE=$(   supergrep nn_write    ${SUBMIT_DIR}/PARAM/namelist_${RESOL_OCE} )
+    PAT_RESTAR=$(   supergrep ln_rstart   ${SUBMIT_DIR}/PARAM/namelist_${RESOL_OCE} )
+    PAT_NRSTAR=$(   supergrep nn_rstctl   ${SUBMIT_DIR}/PARAM/namelist_${RESOL_OCE} )
+    PAT_NMSH=$(     supergrep nn_msh      ${SUBMIT_DIR}/PARAM/namelist_${RESOL_OCE} )
+    PAT_NPRG=$(     supergrep nn_prg      ${SUBMIT_DIR}/PARAM/namelist_${RESOL_OCE} )
+    PAT_NF_PTR=$(   supergrep nf_ptr_wri  ${SUBMIT_DIR}/PARAM/namelist_${RESOL_OCE} )
     PAT_ICE_EMBD=$( supergrep nn_ice_embd ${SUBMIT_DIR}/PARAM/namelist_${RESOL_OCE} )
+    PAT_ICEFLX=$(   supergrep cn_iceflx   ${SUBMIT_DIR}/PARAM/namelist_${RESOL_OCE} )
 
     ORCA_RDT=$(   supergrep rn_rdt     ${SUBMIT_DIR}/PARAM/namelist_${RESOL_OCE} | sed 's/ *rn_rdt *=//' | sed 's/\. *//' )
@@ -193 +202 @@
 
     case ${SEAICE_MODEL} in
-        ( LIM2 ) NN_ICE_EMBD=0 ;;
-        ( LIM3 ) NN_ICE_EMBD=1 ;;
-    esac
-
-    sed -e "s/${PAT_CEXPER}/       cn_exp=\"${config_UserChoices_JobName}\"/" \
+        ( LIM2 ) 
+        NN_ICE_EMBD=0
+        ICEFLX=none
+        ;;
+        ( LIM3 ) 
+        NN_ICE_EMBD=1 
+        ICEFLX=${opa9_UserChoices_iceflx:-linear}
+        ;;
+    esac
+
+    sed -e "s/${PAT_CEXPER}/       cn_exp=\"${config_UserChoices_JobName}\"/"   \
         -e "s/${PAT_NIT000}/       nn_it000=${ORCA_NIT000}/"                    \
         -e "s/${PAT_NITEND}/       nn_itend=${ORCA_NITEND}/"                    \
@@ -204 +219 @@
         -e "s/${PAT_NSTOCK}/       nn_stock=${ORCA_NSTOCK}/"                    \
         -e "s/${PAT_NWRITE}/       nn_write=${ORCA_NWRITE}/"                    \
-        -e "s/${PAT_RESTAR}/       ln_rstart=${ORCA_LRSTAR}/"                 \
-        -e "s/${PAT_NRSTAR}/       nn_rstctl=${ORCA_NRSTDT}/"                    \
+        -e "s/${PAT_RESTAR}/       ln_rstart=${ORCA_LRSTAR}/"                   \
+        -e "s/${PAT_NRSTAR}/       nn_rstctl=${ORCA_NRSTDT}/"                   \
         -e "s/${PAT_NMSH}/         nn_msh=${ORCA_NMSH}/"                        \
         -e "s/${PAT_NPRG}/         nn_prg=${ORCA_NWRITE}/"                      \
-        -e "s/${PAT_NF_PTR}/       nf_ptr_wri=${ORCA_NWRITE}/"                \
-        -e "s/${PAT_ICE_EMBD}/     nn_ice_embd=${NN_ICE_EMBD}/"               \
+        -e "s/${PAT_NF_PTR}/       nf_ptr_wri=${ORCA_NWRITE}/"                  \
+        -e "s/${PAT_ICE_EMBD}/     nn_ice_embd=${NN_ICE_EMBD}/"                 \
+        -e "s/${PAT_ICEFLX}/       cn_iceflx=\'${ICEFLX}'/"                     \
         namelist > namelist.tmp