Changeset 252 for CONFIG/trunk/IPSLCM4_v2

Timestamp:

02/19/08 10:31:12 (17 years ago)

Author:

sdipsl

Message:

SD : lmdz.driver can work with comments inside physiq.def and correctly
handle high frequency request through config card ATM section

File:

• CONFIG/trunk/IPSLCM4_v2/EXP00/COMP/lmdz.driver (modified) (4 diffs)

CONFIG/trunk/IPSLCM4_v2/EXP00/COMP/lmdz.driver

@@ -17 +17 @@
     ##--  Initialisation  ....
     OK_instan=n
-    ##-- 
     OK_journe=n
     OK_mensuel=n
+    ok_hf=n
 
     case ${config_UserChoices_PeriodLength} in
@@ -30 +30 @@
             5D|5d|1D|1d) OK_journe=y ;;
         esac
+        case ${frequency} in
+            HF|hf) ok_hf=y ;;
+        esac
     done
 
     ##--Variables used by LMDZ --
-    PAT_INST=$(     grep 'OK_instan'   ${SUBMIT_DIR}/PARAM/physiq.def )
-    PAT_JOUR=$(     grep 'OK_journe'   ${SUBMIT_DIR}/PARAM/physiq.def )
-    PAT_MOIS=$(     grep 'OK_mensuel'  ${SUBMIT_DIR}/PARAM/physiq.def )
+    PAT_INST=$(     grep -v ^# ${SUBMIT_DIR}/PARAM/physiq.def  | grep 'OK_instan'  )
+    PAT_JOUR=$(     grep -v ^# ${SUBMIT_DIR}/PARAM/physiq.def  | grep 'OK_journe'  )
+    PAT_MOIS=$(     grep -v ^# ${SUBMIT_DIR}/PARAM/physiq.def  | grep 'OK_mensuel' )
+    PAT_HFRE=$(     grep -v ^# ${SUBMIT_DIR}/PARAM/physiq.def  | grep 'ok_hf'      )
 
-    PAT_iphysiq=$(  grep 'iphysiq'     ${SUBMIT_DIR}/PARAM/gcm.def_${RESOL_ATM} )
-    PAT_iperiod=$(  grep 'iperiod'     ${SUBMIT_DIR}/PARAM/gcm.def_${RESOL_ATM} | tail -1)
-    PAT_day_step=$( grep 'day_step'    ${SUBMIT_DIR}/PARAM/gcm.def_${RESOL_ATM} )
-    PAT_ecritphy=$( grep 'ecritphy'    ${SUBMIT_DIR}/PARAM/gcm.def_${RESOL_ATM} )
+    PAT_iphysiq=$(  grep -v ^# ${SUBMIT_DIR}/PARAM/gcm.def_${RESOL_ATM} | grep iphysiq  )
+    PAT_iperiod=$(  grep -v ^# ${SUBMIT_DIR}/PARAM/gcm.def_${RESOL_ATM} | grep iperiod  )
+    PAT_day_step=$( grep -v ^# ${SUBMIT_DIR}/PARAM/gcm.def_${RESOL_ATM} | grep day_step )
+    PAT_ecritphy=$( grep -v ^# ${SUBMIT_DIR}/PARAM/gcm.def_${RESOL_ATM} | grep ecritphy )
 
     ##-- This could be define in lmdz.card, inside section [UserChoices]
     ##-- Otherwise we get the value in *.def
-    iperiod=$(grep iperiod ${SUBMIT_DIR}/PARAM/gcm.def_${RESOL_ATM} | awk -F= '{print $2}' | tail -1)
-    iphysiq=$(grep iphysiq ${SUBMIT_DIR}/PARAM/gcm.def_${RESOL_ATM} | awk -F= '{print $2}')
+    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 ))
+
+    #[ -f ${SUBMIT_DIR}/PARAM/Bands_${BandsResol}_7prc.dat ] && IGCM_sys_Cp ${SUBMIT_DIR}/PARAM/Bands_${BandsResol}_7prc.dat .
 
     IGCM_debug_PopStack "ATM_Initialize"
@@ -70 +76 @@
         -e "s/OK_journe=.*/OK_journe=${OK_journe}/"   \
         -e "s/OK_mensuel=.*/OK_mensuel=${OK_mensuel}/" \
+        -e "s/ok_hf=.*/ok_hf=${ok_hf}/" \
         physiq.def > physiq.def.tmp
     IGCM_sys_Mv physiq.def.tmp physiq.def
@@ -115 +122 @@
     echo FINALIZE ATM !
 
+    #IGCM_sys_Cp Bands_${BandsResol}_${NUM_PROC_ATM}prc.dat ${SUBMIT_DIR}/PARAM
+
     IGCM_debug_PopStack "ATM_Finalize"
 }