Changeset 911

Timestamp:

02/22/10 16:55:34 (15 years ago)

Author:

mafoipsl

Message:

Use LMDZ_sed for sed commands to echo the sed.

File:

• CONFIG/IPSLCM/IPSLCM5/branches/IPSLCM5_v2/EXP00/COMP/lmdz.driver (modified) (4 diffs)

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

@@ -5 +5 @@
     IGCM_debug_PushStack "LMDZ_sed"
 
-    sed -e "s/^${2}\ *=.*/${2}= ${3}/" \
-        ${1} > ${1}.tmp
+    sed -e "s/^${2}\ *=.*/${2}= ${3}/" ${1} > ${1}.tmp
     RET=$?
     echo "LMDZ_sed : ${1} ${2} ${3}"
@@ -58 +57 @@
     done
 
-    ##--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_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  )
-    PAT_iperiod=$(   grep -v ^# ${SUBMIT_DIR}/PARAM/gcm.def_${RESOL_ATM_3D} | grep iperiod  )
-    PAT_day_step=$(  grep -v ^# ${SUBMIT_DIR}/PARAM/gcm.def_${RESOL_ATM_3D} | grep day_step )
-
     ## Read LMDZ_NbPeriod_adjust option in lmdz.card 
     IGCM_card_DefineVariableFromOption ${SUBMIT_DIR}/COMP/lmdz.card UserChoices LMDZ_NbPeriod_adjust
@@ -78 +65 @@
         eval LMDZ_Bands_file_name=\${lmdz_UserChoices_LMDZ_Bands_file_name} > /dev/null 2>&1
     fi
-
-    ##-- This could be define in lmdz.card, inside section [UserChoices]
-    ##-- Otherwise we get the value in *.def
-    iperiod=$( echo ${PAT_iperiod} | awk -F= '{print $2}' )
-    iphysiq=$( echo ${PAT_iphysiq} | awk -F= '{print $2}' )
-    # day_step : number of steps per day (multiple of iperiod)
-    #(( day_step = 48 * iphysiq ))
-    day_step=$( echo ${PAT_day_step} | awk -F= '{print $2}' )
 
     IGCM_debug_PopStack "ATM_Initialize"
@@ -141 +120 @@
     [ ${CumulPeriod} -gt 1 ] && ( IGCM_sys_Get ${R_OUT_ATM_D}/${config_UserChoices_JobName}_Bands_${RESOL_ATM_3D}_${NUM_PROC_ATM}prc.dat_${RefPeriod} Bands_${RESOL_ATM_3D}_${NUM_PROC_ATM}prc.dat ; IGCM_sys_Chmod u+w Bands_${RESOL_ATM_3D}_${NUM_PROC_ATM}prc.dat )
 
-    ## 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=${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
-
-    ## Mise en forme du fichier gcm.def
-    sed -e "s/${PAT_day_step}/day_step=${day_step}/"    \
-        -e "s/${PAT_iperiod}/iperiod=${iperiod}/"       \
-        -e "s/${PAT_iphysiq}/iphysiq=${iphysiq}/"       \
-        gcm.def > gcm.def.tmp
-    IGCM_sys_Mv gcm.def.tmp gcm.def
-
-    ## Mise en forme du fichier run.def
-    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
-    IGCM_sys_Mv run.def.tmp run.def
+    ## physiq.def parameters modified from initial physiq_L${RESOL_ATM_Z}
+    LMDZ_sed physiq.def OK_instan   ${OK_instan}
+    LMDZ_sed physiq.def OK_journe   ${OK_journe}
+    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_ISCCP ${LMDZ_ecrit_ISCCP}
+
+    ## gcm.def parameters : no change since gcm.def_${RESOL_ATM_3D} is used and already modified
+
+    ## run.def parameters
+    LMDZ_sed run.def dayref   ${InitDay}
+    LMDZ_sed run.def anneeref ${InitYear}
+    LMDZ_sed run.def calend   ${CalendarTypeForLmdz}
+    LMDZ_sed run.def nday     ${PeriodLengthInDays}
+    LMDZ_sed run.def raz_date ${RAZ_DATE}
+    LMDZ_sed run.def periodav ${LMDZ_periodav}
+    LMDZ_sed run.def adjust   ${LMDZ_adjust}
 
     ## Read ByPass_hgardfou_teta option in lmdz.card --> divide teta* by 2 if [ $ByPass_hgardfou_teta = 1 ]