Changeset 661

Timestamp:

06/25/09 13:01:48 (15 years ago)

Author:

sdipsl

Message:

Get closer to IPSLCM5_v1. Add 39 levels. Some clean up.

Location:

CONFIG/LMDZOR/branches/LMDZ4OR_v3

Files:

• AA_make (modified) (3 diffs)
• CREATE/COMP/lmdz.card (modified) (1 diff)
• CREATE/COMP/lmdz.driver (modified) (1 diff)
• CREATE/PARAM/gcm.def_LMD144142 (deleted)
• CREATE/PARAM/gcm.def_LMD14496 (deleted)
• CREATE/PARAM/gcm.def_LMD7245 (deleted)
• CREATE/PARAM/gcm.def_LMD9671 (deleted)
• CREATE/PARAM/physiq.def (deleted)
• LMDZOR/COMP/lmdz.card (modified) (6 diffs)
• LMDZOR/COMP/lmdz.driver (modified) (6 diffs)
• LMDZOR/COMP/orchidee.card (modified) (4 diffs)
• LMDZOR/PARAM/Bands_96x71x19_3prc.dat (modified) (1 diff)
• LMDZOR/PARAM/gcm.def_144x142x19 (moved) (moved from CONFIG/LMDZOR/branches/LMDZ4OR_v3/LMDZOR/PARAM/gcm.def_LMD144142) (1 diff)
• LMDZOR/PARAM/gcm.def_144x96x19 (moved) (moved from CONFIG/LMDZOR/branches/LMDZ4OR_v3/LMDZOR/PARAM/gcm.def_LMD14496) (1 diff)
• LMDZOR/PARAM/gcm.def_72x45x19 (moved) (moved from CONFIG/LMDZOR/branches/LMDZ4OR_v3/LMDZOR/PARAM/gcm.def_LMD7245) (1 diff)
• LMDZOR/PARAM/gcm.def_96x71x19 (moved) (moved from CONFIG/LMDZOR/branches/LMDZ4OR_v3/LMDZOR/PARAM/gcm.def_LMD9671) (1 diff)
• LMDZOR/PARAM/physiq.def_L19 (moved) (moved from CONFIG/LMDZOR/branches/LMDZ4OR_v3/LMDZOR/PARAM/physiq.def)
• LMDZOR/PARAM/physiq.def_L39 (added)

CONFIG/LMDZOR/branches/LMDZ4OR_v3/AA_make

@@ -3 +3 @@
 
 all :
-        if [ -s ./.resol ] ; then gmake `cat .resol` ; else gmake LMD9671 ; fi
+        if [ -s ./.resol ] ; then $(M_K) `head -1 .resol` ; else gmake LMD9695 ; fi
 
-LMD7245 : libioipsl liborchidee lmdz7245 verif
+LMD7245 : libioipsl liborchidee lmdz72x45x19 verif
         echo "LMD7245" >.resol
+        echo "RESOL_ATM_3D=72x45x19" >>.resol
         echo "$(LIB_MPI)" >.libmpi
 
-LMD9671 : libioipsl liborchidee lmdz9671 verif
+LMD9671 : libioipsl liborchidee lmdz96x71x19 verif
         echo "LMD9671" >.resol
+        echo "RESOL_ATM_3D=96x71x19" >>.resol
         echo "$(LIB_MPI)" >.libmpi
 
-LMD14496 : libioipsl liborchidee lmdz14496 verif
-        echo "LMD14496" >.resol
+LMD9695 : libioipsl liborchidee lmdz96x95x19 verif
+        echo "ORCA2xLMD9695" >.resol
+        echo "RESOL_ATM_3D=96x95x19" >>.resol
         echo "$(LIB_MPI)" >.libmpi
 
-LMD144142 : libioipsl liborchidee lmdz144142 verif
+LMD9695-L39 : libioipsl liborchidee lmdz96x95x39 verif
+        echo "ORCA2xLMD9695" >.resol
+        echo "RESOL_ATM_3D=96x95x39" >>.resol
+        echo "$(LIB_MPI)" >.libmpi
+
+LMD14496 : libioipsl liborchidee lmdz144x96x19 verif
+        echo "LMD14496" >.resol
+        echo "RESOL_ATM_3D=144x96x19" >>.resol
+        echo "$(LIB_MPI)" >.libmpi
+
+LMD144142 : libioipsl liborchidee lmdz144x142x19 verif
         echo "LMD144142" >.resol
+        echo "RESOL_ATM_3D=144x142x19" >>.resol
+        echo "$(LIB_MPI)" >.libmpi
+
+LMD144142-L39 : libioipsl liborchidee lmdz144x142x39 verif
+        echo "LMD144142" >.resol
+        echo "RESOL_ATM_3D=144x142x39" >>.resol
         echo "$(LIB_MPI)" >.libmpi
 
@@ -41 +60 @@
         (cd ../../modeles/ORCHIDEE; $(M_K) -f Makefile clean)
 
-lmdz7245:
-        (cd ../../modeles/LMDZ4; ./makelmdz_fcm -d 72x45x19 -arch $(FCM_ARCH) create_etat0_limit ; cp bin/create_etat0_limit_72x45x19_phylmd_seq.e ../../bin/create_etat0_limit.e ; )
-        (cd ../../modeles/LMDZ4; ./makelmdz_fcm -d 72x45x19 -v true -parallel mpi -arch $(FCM_ARCH) gcm ; cp bin/gcm_72x45x19_phylmd_para_orch.e ../../bin/gcm.e ; )
-lmdz9671:
-        (cd ../../modeles/LMDZ4; ./makelmdz_fcm -d 96x71x19 -arch $(FCM_ARCH) create_etat0_limit ; cp bin/create_etat0_limit_96x71x19_phylmd_seq.e ../../bin/create_etat0_limit.e ; )
-        (cd ../../modeles/LMDZ4; ./makelmdz_fcm -d 96x71x19 -v true -parallel mpi -arch $(FCM_ARCH) gcm ; cp bin/gcm_96x71x19_phylmd_para_orch.e ../../bin/gcm.e ; )
-lmdz14496:
-        (cd ../../modeles/LMDZ4; ./makelmdz_fcm -d 144x96x19 -arch $(FCM_ARCH) create_etat0_limit ; cp bin/create_etat0_limit_144x96x19_phylmd_seq.e ../../bin/create_etat0_limit.e ; )
-        (cd ../../modeles/LMDZ4; ./makelmdz_fcm -d 144x96x1 -v true -parallel mpi -arch $(FCM_ARCH) gcm ; cp bin/gcm_144x96x19_phylmd_para_orch.e ../../bin/gcm.e ; )
-lmdz144142:
-        (cd ../../modeles/LMDZ4; ./makelmdz_fcm -d 144x142x19 -arch $(FCM_ARCH) create_etat0_limit ; cp bin/create_etat0_limit_144x142x19_phylmd_seq.e ../../bin/create_etat0_limit.e ; )
-        (cd ../../modeles/LMDZ4; ./makelmdz_fcm -d 144x142x19 -v true -parallel mpi -arch $(FCM_ARCH) gcm ; cp bin/gcm_144x142x19_phylmd_para_orch.e ../../bin/gcm.e ; )
+lmdz72x45x19:
+        $(M_K) lmdz RESOL_LMDZ=72x45x19
+
+lmdz96x71x19:
+        $(M_K) lmdz RESOL_LMDZ=96x71x19
+
+lmdz96x95x19:
+        $(M_K) lmdz RESOL_LMDZ=96x95x19
+
+lmdz96x95x39:
+        $(M_K) lmdz RESOL_LMDZ=96x95x39
+
+lmdz144x96x19:
+        $(M_K) lmdz RESOL_LMDZ=144x96x19
+
+lmdz144x142x19:
+        $(M_K) lmdz RESOL_LMDZ=144x142x19
+
+lmdz144x142x39:
+        $(M_K) lmdz RESOL_LMDZ=144x142x39
+
+lmdz:
+        (cd ../../modeles/LMDZ4; ./makelmdz_fcm -cpp ORCHIDEE_NOOPENMP -d $(RESOL_LMDZ) -arch $(FCM_ARCH) create_etat0_limit ; cp bin/create_etat0_limit_$(RESOL_LMDZ)_phylmd_seq.e ../../bin/create_etat0_limit.e ; )
+        (cd ../../modeles/LMDZ4; ./makelmdz_fcm -cpp ORCHIDEE_NOOPENMP -d $(RESOL_LMDZ) -v true -parallel mpi -c $(LIB_MPI) -arch $(FCM_ARCH) gcm ; cp bin/gcm_$(RESOL_LMDZ)_phylmd_para_orch_couple.e ../../bin/gcm.e ; )
 
 verif:
@@ -59 +90 @@
 clean :
         (rm -rf $(LIBDIR)/* ; rm -f $(BINDIR)/* ; rm -rf ../../modeles/LMDZ4/libo/* ../../modeles/LMDZ4/.lock ; rm -fr .resol .libmpi ; )
-

CONFIG/LMDZOR/branches/LMDZ4OR_v3/CREATE/COMP/lmdz.card

@@ -22 +22 @@
 
 [ParametersFiles]
-List=   (${SUBMIT_DIR}/PARAM/physiq.def, .), \
-        (${SUBMIT_DIR}/PARAM/gcm.def_${RESOL_ATM}, gcm.def), \
+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/run.def, .), \
         (${SUBMIT_DIR}/PARAM/traceur.def, .) 

CONFIG/LMDZOR/branches/LMDZ4OR_v3/CREATE/COMP/lmdz.driver

@@ -6 +6 @@
 
     RESOL_ATM=${RESOL}
+
+    [ -f ${SUBMIT_DIR}/../.resol ] && eval $(grep RESOL_ATM_3D ${SUBMIT_DIR}/../.resol) || RESOL_ATM_3D=96x95x19
+
+    RESOL_ATM_Z=$( echo $RESOL_ATM_3D | awk "-Fx" '{print $3}' )
 
     IGCM_debug_PopStack "ATM_Initialize"

CONFIG/LMDZOR/branches/LMDZ4OR_v3/LMDZOR/COMP/lmdz.card

@@ -14 +14 @@
 [InitialStateFiles]
 List= (${R_OUT}/${config_UserChoices_TagName}/${CREATE}/ATM/Output/Restart/${CREATE}_clim_start.nc,    start.nc) \
-      (${R_OUT}/${config_UserChoices_TagName}/${CREATE}/ATM/Output/Restart/${CREATE}_clim_startphy.nc, startphy.nc) 
+      (${R_OUT}/${config_UserChoices_TagName}/${CREATE}/ATM/Output/Restart/${CREATE}_clim_startphy.nc, startphy.nc)
 
 [BoundaryFiles]
 List= () 
-ListNonDel= (${R_OUT}/${config_UserChoices_TagName}/${CREATE}/ATM/Output/Boundary/${CREATE}_clim_limit.nc, limit.nc) 
+ListNonDel= (${R_OUT}/${config_UserChoices_TagName}/${CREATE}/ATM/Output/Boundary/${CREATE}_clim_limit.nc, limit.nc)
 
 # With sulfates :
-#         (${R_BC}/ATM/${config_UserChoices_TagName}/${RESOL_ATM}/HISTORIQUE/so4.run1850.cdf, .),\
-#         (${R_BC}/ATM/${config_UserChoices_TagName}/${RESOL_ATM}/HISTORIQUE/so4.run1900.cdf, .),\
-#         (${R_BC}/ATM/${config_UserChoices_TagName}/${RESOL_ATM}/HISTORIQUE/so4.run1920.cdf, .),\
-#         (${R_BC}/ATM/${config_UserChoices_TagName}/${RESOL_ATM}/HISTORIQUE/so4.run1930.cdf, .),\
-#         (${R_BC}/ATM/${config_UserChoices_TagName}/${RESOL_ATM}/HISTORIQUE/so4.run1940.cdf, .),\
-#         (${R_BC}/ATM/${config_UserChoices_TagName}/${RESOL_ATM}/HISTORIQUE/so4.run1950.cdf, .),\
-#         (${R_BC}/ATM/${config_UserChoices_TagName}/${RESOL_ATM}/HISTORIQUE/so4.run1960.cdf, .),\
-#         (${R_BC}/ATM/${config_UserChoices_TagName}/${RESOL_ATM}/HISTORIQUE/so4.run1970.cdf, .),\
-#         (${R_BC}/ATM/${config_UserChoices_TagName}/${RESOL_ATM}/HISTORIQUE/so4.run1980.cdf, .),\
-#         (${R_BC}/ATM/${config_UserChoices_TagName}/${RESOL_ATM}/HISTORIQUE/so4.run1990.cdf, .),\
-#         (${R_BC}/ATM/${config_UserChoices_TagName}/${RESOL_ATM}/HISTORIQUE/so4.run2000.cdf, .),\
-#         (${R_BC}/ATM/${config_UserChoices_TagName}/${RESOL_ATM}/HISTORIQUE/so4.run.nat.cdf, .),\
-#
+#            (${R_BC}/ATM/${config_UserChoices_TagName}/${RESOL_ATM}/HISTORIQUE/so4.run1850.cdf, SO4.run1850.nc),\
+#            (${R_BC}/ATM/${config_UserChoices_TagName}/${RESOL_ATM}/HISTORIQUE/so4.run1900.cdf, SO4.run1900.nc),\
+#            (${R_BC}/ATM/${config_UserChoices_TagName}/${RESOL_ATM}/HISTORIQUE/so4.run1920.cdf, SO4.run1920.nc),\
+#            (${R_BC}/ATM/${config_UserChoices_TagName}/${RESOL_ATM}/HISTORIQUE/so4.run1930.cdf, SO4.run1930.nc),\
+#            (${R_BC}/ATM/${config_UserChoices_TagName}/${RESOL_ATM}/HISTORIQUE/so4.run1940.cdf, SO4.run1940.nc),\
+#            (${R_BC}/ATM/${config_UserChoices_TagName}/${RESOL_ATM}/HISTORIQUE/so4.run1950.cdf, SO4.run1950.nc),\
+#            (${R_BC}/ATM/${config_UserChoices_TagName}/${RESOL_ATM}/HISTORIQUE/so4.run1960.cdf, SO4.run1960.nc),\
+#            (${R_BC}/ATM/${config_UserChoices_TagName}/${RESOL_ATM}/HISTORIQUE/so4.run1970.cdf, SO4.run1970.nc),\
+#            (${R_BC}/ATM/${config_UserChoices_TagName}/${RESOL_ATM}/HISTORIQUE/so4.run1980.cdf, SO4.run1980.nc),\
+#            (${R_BC}/ATM/${config_UserChoices_TagName}/${RESOL_ATM}/HISTORIQUE/so4.run1990.cdf, SO4.run1990.nc),\
+#            (${R_BC}/ATM/${config_UserChoices_TagName}/${RESOL_ATM}/HISTORIQUE/so4.run2000.cdf, SO4.run2000.nc),\
+#            (${R_BC}/ATM/${config_UserChoices_TagName}/${RESOL_ATM}/HISTORIQUE/so4.run.nat.cdf, SO4.run.nat.nc),\
 # With ISSCP engine :
 #         (${R_BC}/ATM/${config_UserChoices_TagName}/ISCCP/tautab.formatted, .),\
@@ -39 +38 @@
 
 [ParametersFiles]
-List=   (${SUBMIT_DIR}/PARAM/physiq.def, .), \
-        (${SUBMIT_DIR}/PARAM/gcm.def_${RESOL_ATM}, gcm.def), \
+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/run.def, .), \
         (${SUBMIT_DIR}/PARAM/traceur.def, .), \
-        (${SUBMIT_DIR}/PARAM/Bands_${BandsResol}_${NUM_PROC_ATM}prc.dat, .)
+        (${SUBMIT_DIR}/PARAM/Bands_${RESOL_ATM_3D}_${NUM_PROC_ATM}prc.dat, .)
 
 [RestartFiles]
@@ -50 +49 @@
 
 [OutputText]
-List=   (physiq.def, gcm.def, run.def, traceur.def, Bands_${BandsResol}_${NUM_PROC_ATM}prc.dat)
+List=   (physiq.def, gcm.def, run.def, traceur.def, Bands_${RESOL_ATM_3D}_${NUM_PROC_ATM}prc.dat)
 
 [OutputFiles]
@@ -65 +64 @@
 [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, SWup200clr, SWdnTOA, SWupTOA, SWdn200, SWdn200clr, 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)
 
@@ -76 +75 @@
 Patches = ()
 GatherWithInternal = (lon, lat, presnivs, time_counter)
-TimeSeriesVars= (t1000, t925, t850, t700, t600, t500, t400, t300, t250, t200, t150, t100, t70, t50, t30, t20, t10, u1000, u925, u850, u700, u600, u500, u400, u300, u250, u200, u150, u100, u70, u50, u30, u20, u10, v1000, v925, v850, v700, v600, v500, v400, v300, v250, v200, v150, v100, v70, v50, v30, v20, v10, phi1000, phi925, phi850, phi700, phi600, phi500, phi400, phi300, phi250, phi200, phi150, phi100, phi70, phi50, phi30, phi20, phi10, rh1000, rh925, rh850, rh700, rh600, rh500, rh400, rh300, rh250, rh200, rh150, rh100, rh70, rh50, rh30, rh20, rh10, q1000, q925, q850, q700, q600, q500, q400, q300, q250, q200, q150, q100, q70, q50, q30, q20, q10)
+TimeSeriesVars= (temp, phi, q, u, v, rh)
 
 [Post_1M_dynzon]
@@ -86 +85 @@
 Patches= (Patch_20070220_histcom_time_axis)
 GatherWithInternal = (lon, lat, presnivs, time_counter)
-TimeSeriesVars= (bils, cldh, cldl, cldm, cldq, cldt, evap, flat, iwp, lwp, phi500, precip, pluc, plul, prw, psol, rh2m, q2m, sens, sicf, slp, soll, sols, SWdnSFC, taux, tauy, t2m, t2m_max, t2m_min, topl, tops, tsol, u10m, v10m, wind10m, wind10max)
+TimeSeriesVars= (bils, cldh, cldl, cldm, cldq, cldt, evap, flat, iwp, lwp, phi500, precip, pluc, plul, prw, psol, rh2m, q2m, sens, sicf, slp, soll, sols, SWdnSFC, taux, tauy, t2m, t2m_max, t2m_min, topl, tops, tsol, u10m, v10m, wind10m, wind10max, u850, v850, w850, phi850, q850, t850, u700, v700, w700, phi700, q700, t700, u500, v500, w500, phi500, q500, t500, u200, v200, w200, phi200, q200, t200)
 
 [Post_HF_histhf]
 Patches= (Patch_20070220_histcom_time_axis)
 GatherWithInternal = (lon, lat, presnivs, time_counter)
-TimeSeriesVars=(cldt, psol, q2m, slp, t2m, rain, tsol, u10m, v10m, t1000, t925, t850, t700, t500, t300, t250, t200, t150, t100, t50, t30, t10, u1000, u925, u850, u700, u500, u300, u250, u200, u150, u100, u50, u30, u10, v1000, v925, v850, v700, v500, v300, v250, v200, v150, v100, v50, v30, v10, phi1000, phi925, phi850, phi700, phi500, phi300, phi250, phi200, phi150, phi100, phi50, phi30, phi10, w1000, w925, w850, w700, w500, w300, w250, w200, w150, w100, w50, w30, w10, q1000, q925, q850, q700, q500, q300, q250, q200, q150, q100, q50, q30, q10)
+TimeSeriesVars=(cldt, psol, q2m, slp, SWnetOR, SWdownOR, LWdownOR, precip, pluc, plul, prw, t2m, tsol, u10m, v10m, t1000, t925, t850, t700, t500, t300, t250, t200, t150, t100, t50, t30, t10, u1000, u925, u850, u700, u500, u300, u250, u200, u150, u100, u50, u30, u10, v1000, v925, v850, v700, v500, v300, v250, v200, v150, v100, v50, v30, v10, phi1000, phi925, phi850, phi700, phi500, phi300, phi250, phi200, phi150, phi100, phi50, phi30, phi10, w1000, w925, w850, w700, w500, w300, w250, w200, w150, w100, w50, w30, w10, q1000, q925, q850, q700, q500, q300, q250, q200, q150, q100, q50, q30, q10)
 
 [Post_HF_histhf3d]
 Patches= ()
 GatherWithInternal = (lon, lat, presnivs, time_counter)
-TimeSeriesVars=(temp, ovap, vitu, vitv)
+TimeSeriesVars=(temp, theta, ovap, vitu, vitv)

CONFIG/LMDZOR/branches/LMDZ4OR_v3/LMDZOR/COMP/lmdz.driver

@@ -8 +8 @@
 
     RESOL_ATM=${RESOL}
-    case ${RESOL_ATM} in
-        LMD7245)   BandsResol=72x45x19   ;;
-        LMD9671)   BandsResol=96x71x19   ;;
-        LMD14496)  BandsResol=144x96x19  ;;
-        LMD144142) BandsResol=144x142x19 ;;
-    esac
+
+    [ -f ${SUBMIT_DIR}/../.resol ] && eval $(grep RESOL_ATM_3D ${SUBMIT_DIR}/../.resol) || RESOL_ATM_3D=96x95x19
+
+    RESOL_ATM_Z=$( echo $RESOL_ATM_3D | awk "-Fx" '{print $3}' )
 
     ##- Create_etat0_limit version
@@ -48 +46 @@
 
     ##--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_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='  )
     ##--Variables used by LMDZ in gcm.def --
-    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 )
+    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_adjust option in ${compname}.card --> put adjust=y and save Bands_*.dat in ${SUBMIT_DIR}/PARAM
@@ -67 +64 @@
     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}' )
 
-    # day_step : number of steps per day (multiple of iperiod)
-    (( day_step = 48 * iphysiq ))
+    #[ -f ${SUBMIT_DIR}/PARAM/Bands_${RESOL_ATM_3D}_${NUM_PROC_ATM}prc.dat ] && IGCM_sys_Cp ${SUBMIT_DIR}/PARAM/Bands_${RESOL_ATM_3D}_${NUM_PROC_ATM}prc.dat .
 
     IGCM_debug_PopStack "ATM_Initialize"
@@ -79 +78 @@
     IGCM_debug_PushStack "ATM_Update"
 
-    ecritphy=${PeriodLengthInDays}
+    ecrit_mth=${PeriodLengthInDays}
 
     ##-- Remise ou non a zero de la date initiale de LMDZ pour le fichier run.def
@@ -89 +88 @@
 
     ## 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}/"            \
+    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=${ecrit_mth}/" \
         physiq.def > physiq.def.tmp
     IGCM_sys_Mv physiq.def.tmp physiq.def
 
     ## Mise en forme du fichier gcm.def
-    sed -e "s/${PAT_ecritphy}/ecritphy=${ecritphy}/"  \
-        -e "s/${PAT_day_step}/day_step=${day_step}/"  \
-        -e "s/${PAT_iperiod}/iperiod=${iperiod}/"     \
-        -e "s/${PAT_iphysiq}/iphysiq=${iphysiq}/"     \
+    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
@@ -121 +120 @@
     IGCM_debug_PushStack "ATM_Finalize"
 
-    [ ${LMDZ_adjust} = y ] && IGCM_sys_Cp Bands_${BandsResol}_${NUM_PROC_ATM}prc.dat ${SUBMIT_DIR}/PARAM
+    [ ${LMDZ_adjust} = y ] && IGCM_sys_Cp Bands_${RESOL_ATM_3D}_${NUM_PROC_ATM}prc.dat ${SUBMIT_DIR}/PARAM
 
     echo FINALIZE ATM !

CONFIG/LMDZOR/branches/LMDZ4OR_v3/LMDZOR/COMP/orchidee.card

@@ -10 +10 @@
         (${R_INIT}/SRF/${config_UserChoices_TagName}/soils_param.nc, .), \
         (${R_INIT}/SRF/${config_UserChoices_TagName}/routing.nc, .)
+#       (${R_INIT}/SRF/${config_UserChoices_TagName}/PFTmap.1980.nc, pft_new.nc)
 
 [BoundaryFiles]
@@ -16 +17 @@
 # For STOMATE : suppress unused lai file and add reftemp file
 #            (${R_BC}/SRF/${config_UserChoices_TagName}/reftemp.nc, .)
-
 
 [ParametersFiles]
@@ -26 +26 @@
 #  \
 #       (stomate_rest_out.nc, stomate_rest.nc, stomate_rest_in.nc)
-
 
 [OutputText]
@@ -43 +42 @@
 [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, lai, rain, runoff, snow, snowf, snownobio, subli, tair, temp_sol, tsol_max, tsol_min, drainage)
 
 [Post_1M_stomate_history]

CONFIG/LMDZOR/branches/LMDZ4OR_v3/LMDZOR/PARAM/Bands_96x71x19_3prc.dat

@@ -1 @@
- 0  32
- 1  32
- 2  32
- 0  32
- 1  32
- 2  32
- 0  32
- 1  32
- 2  32
- 0  2240
- 1  2240
- 2  2242
-
+ 0  11
+ 1  50
+ 2  11
+ 0  24
+ 1  24
+ 2  24
+ 0  9
+ 1  53
+ 2  10
+ 0  2245
+ 1  2241
+ 2  2236

CONFIG/LMDZOR/branches/LMDZ4OR_v3/LMDZOR/PARAM/gcm.def_144x142x19

@@ -28 +28 @@
 ## periode de la physique (en pas)                                       
 iphysiq=15
-## frequence (en  jours ) de l'ecriture du fichier histphy               
-ecritphy=30
 ##  Cycle diurne  ou non                 
 cycle_diurne=y

CONFIG/LMDZOR/branches/LMDZ4OR_v3/LMDZOR/PARAM/gcm.def_144x96x19

@@ -28 +28 @@
 ## periode de la physique (en pas)                                       
 iphysiq=15
-## frequence (en  jours ) de l'ecriture du fichier histphy               
-ecritphy=30
 ##  Cycle diurne  ou non                 
 cycle_diurne=y

CONFIG/LMDZOR/branches/LMDZ4OR_v3/LMDZOR/PARAM/gcm.def_72x45x19

@@ -28 +28 @@
 ## periode de la physique (en pas)                                       
 iphysiq=20
-## frequence (en  jours ) de l'ecriture du fichier histphy               
-ecritphy=30
 ##  Cycle diurne  ou non                 
 cycle_diurne=y

CONFIG/LMDZOR/branches/LMDZ4OR_v3/LMDZOR/PARAM/gcm.def_96x71x19

@@ -28 +28 @@
 ## periode de la physique (en pas)                                       
 iphysiq=10
-## frequence (en  jours ) de l'ecriture du fichier histphy               
-ecritphy=30
 ##  Cycle diurne  ou non                 
 cycle_diurne=y