Changeset 2875

Timestamp:

06/07/16 09:10:22 (8 years ago)

Author:

cetlod

Message:

Minor updates of NEMO_v6 co,figuration

Location:

CONFIG/UNIFORM/v6/NEMO_v6/GENERAL

Files:

• DRIVER/opa9.driver (modified) (3 diffs)
• DRIVER/pisces.driver (modified) (3 diffs)
• PARAM/namelist_pisces_ORCA2_cfg (modified) (1 diff)

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

@@ -19 +19 @@
     (( DaysSinceJC = $( IGCM_date_DaysSinceJC ${DateBegin} ) + 1 ))
 
-    (( OPA_NDT_DAY  =  86400 / OPA_RDT ))
+    (( OPA_NPDT_DAY  =  86400 / OPA_RDT ))
     (( OPA_NPDT_YEAR  =  OPA_NPDT_DAY * 365     ))
 
-    # Definition from opa9.card of List_jobsbc and List_runsbc used to do to interannual and climatological runs 
-        IGCM_card_DefineArrayFromOption ${SUBMIT_DIR}/COMP/opa9.card Interannual List_jobsbc
-        set -A ListFormulationJobsbc -- \${opa9_Interannual_Listjobsc${opa9_Interannual_List_jobsbc}[*]}
+    IGCM_debug_Print 1 " "
+    IGCM_debug_Print 1 "OPA_RDT        ${OPA_RDT}"
+    IGCM_debug_Print 1 "OPA_NPDT_DAY   ${OPA_NPDT_DAY}"
+    IGCM_debug_Print 1 "OPA_NPDT_YEAR  ${OPA_NPDT_YEAR}"
 
     IGCM_debug_PopStack "OCE_Initialize"
@@ -68 +69 @@
 
     ## Count of number of time steps from begin of OPA job
-    (( OPA_NIT000 = ( PeriodDaysSinceJC - DaysSinceJC ) * OPA_NDT_DAY + 1 ))
-    (( OPA_NDT   = PeriodLengthInDays * OPA_NDT_DAY ))
+    (( OPA_NIT000 = ( PeriodDaysSinceJC - DaysSinceJC ) * OPA_NPDT_DAY + 1 ))
+    (( OPA_NDT   = PeriodLengthInDays * OPA_NPDT_DAY ))
     (( OPA_NITEND = OPA_NIT000 + OPA_NDT - 1))
 
@@ -76 +77 @@
 
     ## Verification of number of time steps per day
-    (( NB_SEC_DAY_MODEL = OPA_NDT_DAY * OPA_RDT ))
+    (( NB_SEC_DAY_MODEL = OPA_NPDT_DAY * OPA_RDT ))
     (( NB_SEC_DAY = 60 * 60 * 24 ))
 
     if [ ${NB_SEC_DAY_MODEL} -ne ${NB_SEC_DAY} ]
         then
-        echo " NB_SEC_DAY_MODEL "${NB_SEC_DAY_MODEL} "NB_SEC_DAY" ${NB_SEC_DAY} "OPA_NDT_DAY" ${OPA_NDT_DAY} "OPA_RDT" ${OPA_RDT}
-        echo " VERIFY OPA_NDT_DAY in opa9.card "
+        echo " NB_SEC_DAY_MODEL "${NB_SEC_DAY_MODEL} "NB_SEC_DAY" ${NB_SEC_DAY} "OPA_NPDT_DAY" ${OPA_NPDT_DAY} "OPA_RDT" ${OPA_RDT}
+        echo " VERIFY OPA_NPDT_DAY in opa9.card "
         exit
     fi

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

@@ -19 +19 @@
        (( DaysSinceJC = $( IGCM_date_DaysSinceJC ${DateBegin} ) + 1 ))
 
-       (( OPA_NDT_DAY  =  86400 / OPA_RDT ))
+       (( OPA_NPDT_DAY  =  86400 / OPA_RDT ))
        (( OPA_NPDT_YEAR  =  OPA_NPDT_DAY * 365     ))
+
+
+       IGCM_debug_Print 1 " "
+       IGCM_debug_Print 1 "OPA_RDT        ${OPA_RDT}"
+       IGCM_debug_Print 1 "OPA_NPDT_DAY   ${OPA_NPDT_DAY}"
+       IGCM_debug_Print 1 "OPA_NPDT_YEAR  ${OPA_NPDT_YEAR}"
+
      fi
 
@@ -64 +71 @@
 
        ## Count of number of time steps from begin of OPA job
-       (( OPA_NIT000 = ( PeriodDaysSinceJC - DaysSinceJC ) * OPA_NDT_DAY + 1 ))
-       (( OPA_NDT   = PeriodLengthInDays * OPA_NDT_DAY ))
+       (( OPA_NIT000 = ( PeriodDaysSinceJC - DaysSinceJC ) * OPA_NPDT_DAY + 1 ))
+       (( OPA_NDT   = PeriodLengthInDays * OPA_NPDT_DAY ))
        (( OPA_NITEND = OPA_NIT000 + OPA_NDT - 1))
 
@@ -71 +78 @@
        OPA_NSTOCK="${OPA_NITEND}"
 
-       ## Verification of number of time steps per day
-       (( NB_SEC_DAY_MODEL = OPA_NDT_DAY * OPA_RDT ))
-       (( NB_SEC_DAY = 60 * 60 * 24 ))
-
-       if [ ${NB_SEC_DAY_MODEL} -ne ${NB_SEC_DAY} ] ; then
-           echo " NB_SEC_DAY_MODEL "${NB_SEC_DAY_MODEL} "NB_SEC_DAY" ${NB_SEC_DAY} "OPA_NDT_DAY" ${OPA_NDT_DAY} "OPA_RDT" ${OPA_RDT}
-           echo " VERIFY OPA_NDT_DAY in opa9.card "
-           exit
-       fi
-        
        # nleapy configuration
        case ${config_UserChoices_CalendarType} in

CONFIG/UNIFORM/v6/NEMO_v6/GENERAL/PARAM/namelist_pisces_ORCA2_cfg

@@ -57 +57 @@
 &nampisdmp     !  Damping 
 !,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+   nn_pisdmp   =  = _AUTO_       !  Frequency of Relaxation
 /
 !'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''