Changeset 1221 for CONFIG/IPSLCM/IPSLCM5B/piControl

Timestamp:

12/17/10 17:36:23 (14 years ago)

Author:

lfairhead

Message:

I was pretty sure I had committed the right version of these

Location:

CONFIG/IPSLCM/IPSLCM5B/piControl/COMP

Files:

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

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

@@ -4 +4 @@
 [UserChoices]
 # Physics package to use
-LMDZ_Physics=AP
+LMDZ_Physics=NPv2.0
+#LMDZ_Physics=AP
+
 ByPass_hgardfou_teta=n
 ByPass_hgardfou_mats=n
@@ -53 +55 @@
 [ParametersFiles]
 List=   (${SUBMIT_DIR}/PARAM/physiq.def_L${RESOL_ATM_Z}_${LMDZ_Physics}, physiq.def), \
-+       (${SUBMIT_DIR}/PARAM/config.def_L${RESOL_ATM_Z}_${LMDZ_Physics}, 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/run.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/piControl/COMP/lmdz.driver

@@ -11 +11 @@
 
     IGCM_debug_PopStack "LMDZ_sed"
+    return $RET
+}
+
+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
 }
@@ -95 +108 @@
     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.
@@ -104 +118 @@
                ;;
         *)
-               LMDZ_ecrit_mth=${PeriodLengthInDays}.
+               LMDZ_ecrit_mth="${PeriodLengthInDays}""day"
                LMDZ_ecrit_ISCCP=${PeriodLengthInDays}.
                LMDZ_periodav=${PeriodLengthInDays}.
@@ -144 +158 @@
     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}