Changeset 697 for CONFIG

Timestamp:

08/05/09 15:01:27 (15 years ago)

Author:

mafoipsl

Message:

Parameters included to prepare 365 days calendar simulation.

Location:

CONFIG/IPSLCM/IPSLCM5/branches/IPSLCM5_WORK/EXP00

Files:

• COMP/lmdz.driver (modified) (5 diffs)
• COMP/opa9.driver (modified) (1 diff)
• PARAM/physiq.def_L19 (modified) (1 diff)
• PARAM/physiq.def_L39 (modified) (1 diff)
• PARAM/run.def (modified) (2 diffs)

CONFIG/IPSLCM/IPSLCM5/branches/IPSLCM5_WORK/EXP00/COMP/lmdz.driver

@@ -10 +10 @@
 
     RESOL_ATM_Z=$( echo ${RESOL_ATM_3D} | awk "-Fx" '{print $3}' )
+
+    ##-- Calendar type for LMDZ
+    case ${config_UserChoices_CalendarType} in
+        leap|gregorian)
+            CalendarTypeForLmdz=earth_366d;;
+        noleap)
+            CalendarTypeForLmdz=earth_365d;;
+        360d)
+            CalendarTypeForLmdz=earth_360d;;
+        *)
+            CalendarTypeForLmdz=earth_360d
+    esac
 
     ##--Frequency purpose ....
@@ -33 +45 @@
 
     ##--Variables used by LMDZ in physiq.def --
-    PAT_INST=$(      grep -v ^# ${SUBMIT_DIR}/PARAM/physiq.def_L${RESOL_ATM_Z}  | grep 'OK_instan='  )
-    PAT_JOUR=$(      grep -v ^# ${SUBMIT_DIR}/PARAM/physiq.def_L${RESOL_ATM_Z}  | grep 'OK_journe='  )
-    PAT_MOIS=$(      grep -v ^# ${SUBMIT_DIR}/PARAM/physiq.def_L${RESOL_ATM_Z}  | grep 'OK_mensuel=' )
-    PAT_HFRE=$(      grep -v ^# ${SUBMIT_DIR}/PARAM/physiq.def_L${RESOL_ATM_Z}  | grep 'ok_hf='      )
-    PAT_ecrit_mth=$( grep -v ^# ${SUBMIT_DIR}/PARAM/physiq.def_L${RESOL_ATM_Z}  | grep 'ecrit_mth='  )
+    PAT_INST=$(        grep -v ^# ${SUBMIT_DIR}/PARAM/physiq.def_L${RESOL_ATM_Z}  | grep 'OK_instan='   )
+    PAT_JOUR=$(        grep -v ^# ${SUBMIT_DIR}/PARAM/physiq.def_L${RESOL_ATM_Z}  | grep 'OK_journe='   )
+    PAT_MOIS=$(        grep -v ^# ${SUBMIT_DIR}/PARAM/physiq.def_L${RESOL_ATM_Z}  | grep 'OK_mensuel='  )
+    PAT_HFRE=$(        grep -v ^# ${SUBMIT_DIR}/PARAM/physiq.def_L${RESOL_ATM_Z}  | grep 'ok_hf='       )
+    PAT_ecrit_mth=$(   grep -v ^# ${SUBMIT_DIR}/PARAM/physiq.def_L${RESOL_ATM_Z}  | grep 'ecrit_mth='   )
+    PAT_ecrit_ISCCP=$( grep -v ^# ${SUBMIT_DIR}/PARAM/physiq.def_L${RESOL_ATM_Z}  | grep 'ecrit_ISCCP=' )
     ##--Variables used by LMDZ in gcm.def --
     PAT_iphysiq=$(   grep -v ^# ${SUBMIT_DIR}/PARAM/gcm.def_${RESOL_ATM_3D} | grep iphysiq  )
@@ -65 +78 @@
     IGCM_debug_PushStack "ATM_Update"
 
-    ecrit_mth=${PeriodLengthInDays}.
+    LMDZ_ecrit_mth=${PeriodLengthInDays}.
+    LMDZ_ecrit_ISCCP=${PeriodLengthInDays}.
+    LMDZ_periodav=${PeriodLengthInDays}.
 
     ##-- Remise ou non a zero de la date initiale de LMDZ pour le fichier run.def
@@ -75 +90 @@
 
     ## Mise en forme du fichier physiq.def
-    sed -e "s/${PAT_INST}/OK_instan=${OK_instan}/"      \
-        -e "s/${PAT_JOUR}/OK_journe=${OK_journe}/"      \
-        -e "s/${PAT_MOIS}/OK_mensuel=${OK_mensuel}/"    \
-        -e "s/${PAT_HFRE}/ok_hf=${ok_hf}/"              \
-        -e "s/${PAT_ecrit_mth}/ecrit_mth=${ecrit_mth}/" \
+    sed -e "s/${PAT_INST}/OK_instan=${OK_instan}/"                 \
+        -e "s/${PAT_JOUR}/OK_journe=${OK_journe}/"                 \
+        -e "s/${PAT_MOIS}/OK_mensuel=${OK_mensuel}/"               \
+        -e "s/${PAT_HFRE}/ok_hf=${ok_hf}/"                         \
+        -e "s/${PAT_ecrit_mth}/ecrit_mth=${LMDZ_ecrit_mth}/"       \
+        -e "s/${PAT_ecrit_ISCCP}/ecrit_ISCCP=${LMDZ_ecrit_ISCCP}/" \
         physiq.def > physiq.def.tmp
     IGCM_sys_Mv physiq.def.tmp physiq.def
@@ -93 +109 @@
     sed -e "s/_dayref_/${InitDay}/"                    \
         -e "s/_anneeref_/${InitYear}/"                 \
+        -e "s/_calend_/${CalendarTypeForLmdz}/"        \
         -e "s/_nday_/${PeriodLengthInDays}/"           \
         -e "s/_raz_date_/${RAZ_DATE}/"                 \
+        -e "s/_periodav_/${LMDZ_periodav}/"            \
         -e "s/_adjust_/${LMDZ_adjust}/"                \
         run.def > run.def.tmp

CONFIG/IPSLCM/IPSLCM5/branches/IPSLCM5_WORK/EXP00/COMP/opa9.driver

@@ -154 +154 @@
     # nleapy configuration
     case ${config_UserChoices_CalendarType} in
-        leap)
+        leap|gregorian)
             ORCA_NLEAPY=1;;
         noleap)

CONFIG/IPSLCM/IPSLCM5/branches/IPSLCM5_WORK/EXP00/PARAM/physiq.def_L19

@@ -69 +69 @@
 ecrit_day=1.
 ### ecrit_mth = frequence ecriture fichier histmth.nc en jours
-ecrit_mth=30.
+ecrit_mth=_ecrit-mth_
 ### freqin_isccp = frequence input en secondes du simulateur ISCCP
 freq_ISCCP=10800.
 ### freqout_isccp = frequence output en jours du simulateur ISCCP
-ecrit_ISCCP=30.
+ecrit_ISCCP=_ecrit-ISCCP_
 ### niveau du diagnostique de conservation d energie
 if_ebil=0

CONFIG/IPSLCM/IPSLCM5/branches/IPSLCM5_WORK/EXP00/PARAM/physiq.def_L39

@@ -69 +69 @@
 ecrit_day=1.
 ### ecrit_mth = frequence ecriture fichier histmth.nc en jours
-ecrit_mth=30.
+ecrit_mth=_ecrit-mth_
 ### freqin_isccp = frequence input en secondes du simulateur ISCCP
 freq_ISCCP=10800.
 ### freqout_isccp = frequence output en jours du simulateur ISCCP
-ecrit_ISCCP=30.
+ecrit_ISCCP=_ecrit-ISCCP_
 ### niveau du diagnostique de conservation d energie
 if_ebil=0

CONFIG/IPSLCM/IPSLCM5/branches/IPSLCM5_WORK/EXP00/PARAM/run.def

@@ -7 +7 @@
 ## Type de calendrier utilise
 ## valeur possible: earth_360d (defaut), earth_365d, earth_366d
-calend=earth_360d
+calend=_calend_
 ## Jour de l'etat initial ( = 350  si 20 Decembre ,par expl. ,comme ici )
 dayref=_dayref_
@@ -23 +23 @@
 ok_dynzon=n
 ## periode de stockage fichier dynzon (en jour)
-periodav=30.
+periodav=_periodav_
 ## activation du calcul d equilibrage de charge
 adjust=_adjust_