Changeset 1220 for CONFIG/IPSLCM/IPSLCM5B/EXP00/COMP

Timestamp:

12/15/10 17:15:45 (14 years ago)

Author:

lfairhead

Message:

Modifications needed to take advantage of the split in physiq.def in LMDZ.
The old physiq.def is split in 2: a shorter physiq.def that only includes
parameters and constants needed by the parametrizations and a config.def that
includes information related to the configuration one wishes to run (e.g. orbital
parameters, gaz constants, aerosols, etc...). The output.def is also taken into account

Warning: work in progress. Probably still needs some testing. Tested on brodie for the moment

Location:

CONFIG/IPSLCM/IPSLCM5B/EXP00/COMP

Files:

• lmdz.card (modified) (2 diffs)
• lmdz.driver (modified) (6 diffs)

CONFIG/IPSLCM/IPSLCM5B/EXP00/COMP/lmdz.card

@@ -3 +3 @@
 
 [UserChoices]
+# Physics package to use
+LMDZ_Physics=NPv2.0
+#LMDZ_Physics=AP
+
 ByPass_hgardfou_teta=n
 ByPass_hgardfou_mats=n
@@ -51 +55 @@
 
 [ParametersFiles]
-List=   (${SUBMIT_DIR}/PARAM/physiq.def_L${RESOL_ATM_Z}, physiq.def), \
-        (${SUBMIT_DIR}/PARAM/gcm.def_${RESOL_ATM_3D},    gcm.def),    \
-        (${SUBMIT_DIR}/PARAM/cosp_input_nl.txt,                .),    \
-        (${SUBMIT_DIR}/PARAM/cosp_output_nl.txt,               .),    \
-        (${SUBMIT_DIR}/PARAM/run.def, .), \
+List=   (${SUBMIT_DIR}/PARAM/physiq.def_L${RESOL_ATM_Z}_${LMDZ_Physics}, physiq.def), \
+        (${SUBMIT_DIR}/PARAM/config.def,                                 config.def), \
+        (${SUBMIT_DIR}/PARAM/gcm.def_${RESOL_ATM_3D},                       gcm.def), \
+        (${SUBMIT_DIR}/PARAM/cosp_input_nl.txt,                                   .), \
+        (${SUBMIT_DIR}/PARAM/cosp_output_nl.txt,                                  .), \
+        (${SUBMIT_DIR}/PARAM/output.def,                                          .), \
+        (${SUBMIT_DIR}/PARAM/run.def,                                             .), \
         (${SUBMIT_DIR}/PARAM/traceur.def, .)
 

CONFIG/IPSLCM/IPSLCM5B/EXP00/COMP/lmdz.driver

@@ -14 +14 @@
 }
 
+function LMDZ_string_sed
+{
+    IGCM_debug_PushStack "LMDZ_string_sed"
+
+    sed -e "s/${2}/${3}/" ${1} > ${1}.tmp
+    RET=$?
+    echo "LMDZ_sed : ${1} ${2} ${3}"
+    \mv ${1}.tmp ${1}
+
+    IGCM_debug_PopStack "LMDZ_string_sed"
+    return $RET
+}
+
 function ATM_Initialize
 {
     IGCM_debug_PushStack "ATM_Initialize"
 
+    set -vx
+
     RESOL_ATM=$( echo $RESOL | awk "-Fx" '{print $2}' | awk "-F-" '{print $1}')
 
@@ -23 +38 @@
 
     RESOL_ATM_Z=$( echo ${RESOL_ATM_3D} | awk "-Fx" '{print $3}' )
-
+ 
     ##-- Calendar type for LMDZ
     case ${config_UserChoices_CalendarType} in
@@ -57 +72 @@
     done
 
+    ## Read LMDZPhysics option in lmdz.card 
+    IGCM_card_DefineVariableFromOption ${SUBMIT_DIR}/COMP/lmdz.card UserChoices LMDZ_Physics
+    LMDZ_Physics=${lmdz_UserChoices_LMDZ_Physics}
+
     ## Read LMDZ_NbPeriod_adjust option in lmdz.card 
     IGCM_card_DefineVariableFromOption ${SUBMIT_DIR}/COMP/lmdz.card UserChoices LMDZ_NbPeriod_adjust
@@ -91 +110 @@
     case ${config_UserChoices_PeriodLength} in
         *Y|*y) 
-               LMDZ_ecrit_mth=30. 
+#               LMDZ_ecrit_mth=30. 
+               LMDZ_ecrit_mth=1mth 
                LMDZ_ecrit_ISCCP=30.
                LMDZ_periodav=30.
@@ -100 +120 @@
                ;;
         *)
-               LMDZ_ecrit_mth=${PeriodLengthInDays}.
+               LMDZ_ecrit_mth="${PeriodLengthInDays}""day"
                LMDZ_ecrit_ISCCP=${PeriodLengthInDays}.
                LMDZ_periodav=${PeriodLengthInDays}.
@@ -140 +160 @@
     LMDZ_sed physiq.def OK_mensuel  ${OK_mensuel}
     LMDZ_sed physiq.def ok_hf       ${ok_hf}
-    LMDZ_sed physiq.def ecrit_mth   ${LMDZ_ecrit_mth}
+#    LMDZ_sed physiq.def ecrit_mth   ${LMDZ_ecrit_mth}
+    LMDZ_string_sed config.def _ecrit-mth_   ${LMDZ_ecrit_mth}
     LMDZ_sed physiq.def ecrit_ISCCP ${LMDZ_ecrit_ISCCP}
     LMDZ_sed physiq.def ok_cosp     ${LMDZ_COSP_OK}