Changeset 1363 for branches/libIGCM/ORCA2_LIM/IGCM00/COMP/nemo.driver

Timestamp:

2009-04-01T09:46:59+02:00 (15 years ago)

Author:

ctlod

Message:

update nemo.card, nemo.driver and config.card scripts, see ticket: #391

File:

• branches/libIGCM/ORCA2_LIM/IGCM00/COMP/nemo.driver (modified) (6 diffs)

branches/libIGCM/ORCA2_LIM/IGCM00/COMP/nemo.driver

@@ -7 +7 @@
     JOB_NAME=${config_UserChoices_JobName}
 
-    if [ -z "${opa_UserChoices_OPA_NPDT_JOURS}" ] ; then
-   ORCA_NPDT_JOUR=15
+    if [ -z "${opa_UserChoices_OPA_NDT_DAY}" ] ; then
+   OPA_NDT_DAY=15
     else
-   ORCA_NPDT_JOUR=${opa_UserChoices_OPA_NPDT_JOURS}
+   OPA_NDT_DAY=${opa_UserChoices_OPA_NDT_DAY}
     fi
 
@@ -66 +66 @@
     case ${frequency} in
    1Y|1y)
-       (( ORCA_NWRITE = ORCA_NPDT_JOUR * factor * $( IGCM_date_DaysInYear  ${year} ) ))          ;
+       (( ORCA_NWRITE = OPA_NDT_DAY * factor * $( IGCM_date_DaysInYear  ${year} ) ))          ;
        PREFIX_NWRITE=${config_UserChoices_JobName}_${factor}y ;
        R_OUT_OCE_NWRITE=${R_OUT_OCE_O_Y} ;
@@ -72 +72 @@
        WF1=${factor}Y ;;
    1M|1m)
-       (( ORCA_NWRITE = ORCA_NPDT_JOUR * factor * $( IGCM_date_DaysInMonth ${year} ${month} ) )) ;
+       (( ORCA_NWRITE = OPA_NDT_DAY * factor * $( IGCM_date_DaysInMonth ${year} ${month} ) )) ;
        PREFIX_NWRITE=${config_UserChoices_JobName}_${factor}m ;
        R_OUT_OCE_NWRITE=${R_OUT_OCE_O_M} ;
@@ -78 +78 @@
        WF1=${factor}M ;;
    *D|*d)
-       (( ORCA_NWRITE = ORCA_NPDT_JOUR * factor  ))  ;
+       (( ORCA_NWRITE = OPA_NDT_DAY * factor  ))  ;
        PREFIX_NWRITE=${config_UserChoices_JobName}_${factor}d ;
        R_OUT_OCE_NWRITE=${R_OUT_OCE_O_D} ;
@@ -92 +92 @@
 
     ##-- Calcul du numero de pas de temps de debut de job ORCA
-    (( ORCA_NIT000 = ( PeriodDaysSinceJC - DaysSinceJC ) * ORCA_NPDT_JOUR + 1 ))
-    (( ORCA_NPDT   = PeriodLengthInDays * ORCA_NPDT_JOUR ))
-    (( ORCA_NITEND = ORCA_NIT000 + ORCA_NPDT - 1))
+    (( ORCA_NIT000 = ( PeriodDaysSinceJC - DaysSinceJC ) * OPA_NDT_DAY + 1 ))
+    (( OPA_NDT   = PeriodLengthInDays * OPA_NDT_DAY ))
+    (( ORCA_NITEND = ORCA_NIT000 + OPA_NDT - 1))
 
-    if [ "${ORCA_NSTOCK}" -gt "${ORCA_NPDT}" ]
-   then
-   ORCA_NSTOCK="${ORCA_NPDT}"
-    fi
+    ## On force 1 restart par simulation a la fin
+    ORCA_NSTOCK="${ORCA_NITEND}"
 
     ##-- verification du nb de pas de temps par jour
-    (( NB_SEC_JOUR_MODEL = ORCA_NPDT_JOUR * ORCA_RDT ))
-    (( NB_SEC_JOUR = 60 * 60 * 24 ))
+    (( NB_SEC_DAY_MODEL = OPA_NDT_DAY * ORCA_RDT ))
+    (( NB_SEC_DAY = 60 * 60 * 24 ))
 
-    if [ ${NB_SEC_JOUR_MODEL} -ne ${NB_SEC_JOUR} ]
+    if [ ${NB_SEC_DAY_MODEL} -ne ${NB_SEC_DAY} ]
    then
-        echo " VERIFIER ORCA_NPDT_JOUR dans le job ${JOB} "
+        echo " VERIFIER OPA_NDT_DAY dans le job ${JOB} "
         exit
     fi
@@ -164 +162 @@
     IGCM_sys_Mv namelist.tmp namelist
 
+    echo 'Variables automatically updated in namelists'
+    grep AUTO namelist*
+
     IGCM_debug_PopStack "OCE_Update"
 }