Changeset 641

Timestamp:

06/12/09 14:13:43 (15 years ago)

Author:

sdipsl

Message:

• manage iphysiq indepedantly from day_step
• tweak time series variable
• add area variable in time series files to ease monitoring process

Location:

CONFIG/IPSLCM/IPSLCM5/branches/IPSLCM5_WORK

Files:

• AA_make (modified) (1 diff)
• EXP00/COMP/lmdz.card (modified) (2 diffs)
• EXP00/COMP/lmdz.driver (modified) (4 diffs)
• EXP00/COMP/orchidee.card (modified) (1 diff)

CONFIG/IPSLCM/IPSLCM5/branches/IPSLCM5_WORK/AA_make

@@ -59 +59 @@
 
 lmdz9695:
-        (cd ../../modeles/LMDZ4; ./makelmdz_fcm -cpp ORCHIDEE_NOOPENMP -d 96x95x19 -arch $(FCM_ARCH) create_etat0_limit ; cp bin/create_etat0_limit_96x95x19_phylmd_seq.e ../../bin/create_etat0_limit.e ; )
-        (cd ../../modeles/LMDZ4; ./makelmdz_fcm -cpp ORCHIDEE_NOOPENMP -d 96x95x19 -v true -parallel mpi -c $(LIB_MPI) -arch $(FCM_ARCH) gcm ; cp bin/gcm_96x95x19_phylmd_para_orch_couple.e ../../bin/gcm.e ; )
+        (cd ../../modeles/LMDZ4; ./makelmdz_fcm -cpp ORCHIDEE_NOOPENMP -d 96x95x39 -arch $(FCM_ARCH) create_etat0_limit ; cp bin/create_etat0_limit_96x95x39_phylmd_seq.e ../../bin/create_etat0_limit.e ; )
+        (cd ../../modeles/LMDZ4; ./makelmdz_fcm -cpp ORCHIDEE_NOOPENMP -d 96x95x39 -v true -parallel mpi -c $(LIB_MPI) -arch $(FCM_ARCH) gcm ; cp bin/gcm_96x95x39_phylmd_para_orch_couple.e ../../bin/gcm.e ; )
 
 lmdz144142:

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

@@ -57 +57 @@
         (histNMC.nc,      ${R_OUT_ATM_O_M}/${PREFIX}_1M_histNMC.nc,      NONE), \
         (histrac.nc,      ${R_OUT_ATM_O_M}/${PREFIX}_1M_histrac.nc,      NONE), \
-        (dynzon.nc,       ${R_OUT_ATM_O_M}/${PREFIX}_1M_dynzon.nc,       Post_1M_dynzon), \
+        (dynzon.nc,       ${R_OUT_ATM_O_M}/${PREFIX}_1M_dynzon.nc,       NONE), \
         (histday.nc,      ${R_OUT_ATM_O_D}/${PREFIX}_1D_histday.nc,      NONE), \
         (histhf.nc,       ${R_OUT_ATM_O_H}/${PREFIX}_HF_histhf.nc,       NONE), \
@@ -65 +65 @@
 [Post_1M_histmth]
 Patches= (Patch_20070220_histcom_time_axis)
-GatherWithInternal = (lon, lat, presnivs, time_counter)
+GatherWithInternal = (lon, lat, presnivs, time_counter, aire)
 TimeSeriesVars= (bils, cldh, cldl, cldm, cldq, cldt, evap, iwp, lwp, LWdnSFC, LWdnSFCclr, LWupSFCclr, LWdn200, LWdn200clr, LWup200, LWup200clr, precip, prw, pluc, psol, q2m, sens, slp, snow, soll0, soll, sols0, sols, SWdnSFC, SWupSFC, SWup200, SWdnTOA, SWupTOA, SWdn200, SWdnSFCclr, SWupSFCclr, SWupTOAclr, t2m, taux_ter, taux_sic, taux_lic, taux_oce, tauy_ter, tauy_sic, tauy_lic, tauy_oce, lat_ter, lat_sic, lat_lic, lat_oce, topl0, topl, tops0, tops, tsol, tsol_ter, tsol_lic, tsol_oce, tsol_sic , u10m, u500, v10m, v500, w500, pourc_ter, pourc_oce, pourc_sic, pourc_lic)
 

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

@@ -13 +13 @@
         LMD9671)   BandsResol=96x71x19   ;;
         LMD9695)   BandsResol=96x95x19   ;;
+        LMD9696)   BandsResol=96x96x19   ;;
         LMD14496)  BandsResol=144x96x19  ;;
         LMD144142) BandsResol=144x142x19 ;;
@@ -39 +40 @@
 
     ##--Variables used by LMDZ in 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_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='      )
     ##--Variables used by LMDZ in gcm.def --
     PAT_iphysiq=$(  grep -v ^# ${SUBMIT_DIR}/PARAM/gcm.def_${RESOL_ATM} | grep iphysiq  )
@@ -58 +59 @@
     iphysiq=$( echo ${PAT_iphysiq} | awk -F= '{print $2}' )
     # day_step : number of steps per day (multiple of iperiod)
-    (( day_step = 48 * iphysiq ))
+    #(( day_step = 48 * iphysiq ))
+    day_step=$( echo ${PAT_day_step} | awk -F= '{print $2}' )
 
-    #[ -f ${SUBMIT_DIR}/PARAM/Bands_${BandsResol}_7prc.dat ] && IGCM_sys_Cp ${SUBMIT_DIR}/PARAM/Bands_${BandsResol}_7prc.dat .
+    #[ -f ${SUBMIT_DIR}/PARAM/Bands_${BandsResol}_${NUM_PROC_ATM}prc.dat ] && IGCM_sys_Cp ${SUBMIT_DIR}/PARAM/Bands_${BandsResol}_${NUM_PROC_ATM}prc.dat .
 
     IGCM_debug_PopStack "ATM_Initialize"
@@ -80 +82 @@
 
     ## Mise en forme du fichier physiq.def
-    sed -e "s/OK_instan=.*/OK_instan=${OK_instan}/"    \
-        -e "s/OK_journe=.*/OK_journe=${OK_journe}/"    \
-        -e "s/OK_mensuel=.*/OK_mensuel=${OK_mensuel}/" \
-        -e "s/ok_hf=.*/ok_hf=${ok_hf}/"                \
+    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}/"            \
         physiq.def > physiq.def.tmp
     IGCM_sys_Mv physiq.def.tmp physiq.def

CONFIG/IPSLCM/IPSLCM5/branches/IPSLCM5_WORK/EXP00/COMP/orchidee.card

@@ -28 +28 @@
 [Post_1M_sechiba_history]
 Patches = (Patch_20070220_histcom_time_axis)
-GatherWithInternal = (lon, lat, veget, time_counter)
-TimeSeriesVars = (alb_nir, alb_vis, bqsb, evap, fluxlat, fluxsens, gqsb, netrad, qair, rain, runoff, snow, snowf, subli, tair, tsol_max, tsol_min, drainage)
+GatherWithInternal = (lon, lat, veget, time_counter, Areas)
+TimeSeriesVars = (alb_nir, alb_vis, bqsb, evap, fluxlat, fluxsens, gqsb, netrad, qair, rain, runoff, snow, snowf, snownobio, subli, tair, temp_sol, tsol_max, tsol_min, drainage)