Changeset 1169 for CONFIG

Timestamp:

10/19/10 14:41:29 (14 years ago)

Author:

jgipsl

Message:

Modification in developement branch LMDZOR_v4 :

• added resolution 280x280x39 with zoom Africa (cordex grid)
• bug correction in CREATE experience for calendar=leap (anneref=year and calend=gregorian)
• added always nudging(ok_guide=y)
• added scripts for interpolating ERAI analysis to model horizontal grid. These scripts have to be used by hand, on other machine.

Location:

CONFIG/LMDZOR/branches/LMDZOR_v4

Files:

• AA_make (modified) (3 diffs)
• AMIP/COMP/lmdz.card (modified) (4 diffs)
• AMIP/PARAM/gcm.def_280x280x39 (added)
• AMIP/PARAM/guide.def (added)
• AMIP/PARAM/run.def (modified) (2 diffs)
• CREATE/COMP/lmdz.card_Climat (moved) (moved from CONFIG/LMDZOR/branches/LMDZOR_v4/CREATE/COMP/lmdz.card)
• CREATE/COMP/lmdz.card_Interannuel (modified) (3 diffs)
• CREATE/COMP/lmdz.driver (modified) (3 diffs)
• CREATE/PARAM (deleted)
• CREATE/SCRIPT (added)
• CREATE/SCRIPT/add_step.x (added)
• CREATE/SCRIPT/era2gcm.x (added)
• CREATE/SCRIPT/get_era.x (added)
• CREATE/config.card_Climat (moved) (moved from CONFIG/LMDZOR/branches/LMDZOR_v4/CREATE/config.card)
• job.comp (deleted)

CONFIG/LMDZOR/branches/LMDZOR_v4/AA_make

@@ -3 +3 @@
 
 all :
-        if [ -s ./.resol ] ; then $(M_K) `head -1 .resol` ; else gmake LMD9695-L39 ; fi
+        if [ -s ./.resol ] ; then $(M_K) `head -1 .resol` ; else gmake LMD280280-L39 ; fi
 
 LMD7245 : libioipsl liborchidee lmdz72x45x19 verif
@@ -38 +38 @@
         echo "LMD144142" >.resol
         echo "RESOL_ATM_3D=144x142x39" >>.resol
+        echo "$(LIB_MPI)" >.libmpi
+
+LMD280280-L39 : libioipsl liborchidee lmdz280x280x39 verif
+        echo "LMD280280-L39" >.resol
+        echo "RESOL_ATM_3D=280x280x39" >>.resol
         echo "$(LIB_MPI)" >.libmpi
 
@@ -81 +86 @@
         $(M_K) lmdz RESOL_LMDZ=144x142x39
 
+lmdz280x280x39:
+        $(M_K) lmdz RESOL_LMDZ=280x280x39
+
 lmdz:
         (cd ../../modeles/LMDZ4; ./makelmdz_fcm -cpp ORCHIDEE_NOOPENMP -d $(RESOL_LMDZ) -arch $(FCM_ARCH) ce0l ; cp bin/ce0l_$(RESOL_LMDZ)_phylmd_seq.e ../../bin/create_etat0_limit.e ; )

CONFIG/LMDZOR/branches/LMDZOR_v4/AMIP/COMP/lmdz.card

@@ -16 +16 @@
 
 # To force higher writing level for aerosol. 
-# LMDZ_Freq_aero : frequency for writing (in PeriodLength : 10Years = 120) , 
-# LMDZ_Length_aero : length of writing (in PeriodLength : 1Year = 12). 
+# LMDZ_Freq_aero   : frequency for writing (in PeriodLength : 10Years = 120) , 
+# LMDZ_Length_aero : length of writing     (in PeriodLength : 1Year = 12). 
 # To cancel this option put LMDZ_Length_aero=0
 LMDZ_Freq_aero=120
@@ -34 +34 @@
 
 [InitialStateFiles]
-List=   (${R_OUT}/${config_UserChoices_TagName}/${CREATE}/ATM/Output/Restart/${CREATE}_${year}_start.nc,    start.nc) \
-        (${R_OUT}/${config_UserChoices_TagName}/${CREATE}/ATM/Output/Restart/${CREATE}_${year}_startphy.nc, startphy.nc) 
+List=   (${R_OUT}/${config_UserChoices_TagName}/${CREATE}/ATM/Output/Restart/${CREATE}_${year}_start.nc,    start.nc),\
+        (${R_OUT}/${config_UserChoices_TagName}/${CREATE}/ATM/Output/Restart/${CREATE}_${year}_startphy.nc, startphy.nc) 
 
 [BoundaryFiles]
-List= (${R_OUT}/${config_UserChoices_TagName}/${CREATE}/ATM/Output/Boundary/${CREATE}_${year}_limit.nc,       limit.nc)
-#      (${R_OUT}/${config_UserChoices_TagName}/${CREATE}/ATM/Output/Boundary/${CREATE}_${year}_climoz_LMDZ.nc, climoz_LMDZ.nc)
+List= (${R_OUT}/${config_UserChoices_TagName}/${CREATE}/ATM/Output/Boundary/${CREATE}_${year}_limit.nc,       limit.nc),\
+      (/dmnfs/cont003/p86ghatt/IGCM_OUT/LMDZOR/NUDGING-CORDEX-AFR/${year}${month}/u.nc, u.nc),\
+      (/dmnfs/cont003/p86ghatt/IGCM_OUT/LMDZOR/NUDGING-CORDEX-AFR/${year}${month}/v.nc, v.nc)
+
 # With AR5 aerosols (including ASSO4M(=SO4), CSSO4M, AIBCM, ASBCM, AIPOMM, ASPOMM, ASSSM, CSSSM, SSSSM, CIDUSTM)
 # With AR5 ozone(tropo + strato from LMDZOR-INCA-REPROBUS simulations)
@@ -61 +63 @@
         (${SUBMIT_DIR}/PARAM/cosp_input_nl.txt,                .),    \
         (${SUBMIT_DIR}/PARAM/cosp_output_nl.txt,               .),    \
+        (${SUBMIT_DIR}/PARAM/guide.def, .), \
         (${SUBMIT_DIR}/PARAM/run.def, .), \
         (${SUBMIT_DIR}/PARAM/traceur.def, .)
@@ -69 +72 @@
 
 [OutputText]
-List=   (physiq.def, gcm.def, run.def, traceur.def, used_run.def, lmdz.x.prt)
+List=   (physiq.def, gcm.def, run.def, traceur.def, guide.def, used_run.def, lmdz.x.prt)
 
 [OutputFiles]

CONFIG/LMDZOR/branches/LMDZOR_v4/AMIP/PARAM/run.def

@@ -4 +4 @@
 INCLUDEDEF=gcm.def
 INCLUDEDEF=orchidee.def
+INCLUDEDEF=guide.def
 ## Type de calendrier utilise
 ## valeur possible: earth_360d (defaut), earth_365d, earth_366d
@@ -36 +37 @@
 ### VEGET= y si ORCHIDEE, =n si bucket
 VEGET=y
-

CONFIG/LMDZOR/branches/LMDZOR_v4/CREATE/COMP/lmdz.card_Interannuel

@@ -5 +5 @@
 
 [UserChoices]
+# Directory for parameter files
+PARAM_DIR=${SUBMIT_DIR}/../AMIP/PARAM
 
 [InitialStateFiles]
@@ -24 +26 @@
 
 [ParametersFiles]
-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/orchidee.def, .), \
-        (${SUBMIT_DIR}/PARAM/run.def, .), \
-        (${SUBMIT_DIR}/PARAM/traceur.def, .) 
+List=   (${PARAM_DIR}/physiq.def_L${RESOL_ATM_Z}, physiq.def), \
+        (${PARAM_DIR}/gcm.def_${RESOL_ATM_3D}, gcm.def), \
+        (${PARAM_DIR}/orchidee.def, .), \
+        (${PARAM_DIR}/run.def, .), \
+        (${PARAM_DIR}/traceur.def, .),\
+        (${PARAM_DIR}/guide.def, .) 
 
 [RestartFiles]
@@ -34 +37 @@
 
 [OutputText]
-List=   (physiq.def, gcm.def, run.def, traceur.def)
+List=   (physiq.def, gcm.def, run.def, traceur.def, guide.def)
 
 [OutputFiles]

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

@@ -27 +27 @@
     case ${config_UserChoices_CalendarType} in
         leap|gregorian)
-            CalendarTypeForLmdz=earth_366d;;
+            CalendarTypeForLmdz=gregorian;;
         noleap)
             CalendarTypeForLmdz=earth_365d;;
@@ -103 +103 @@
     ## run.def parameters
     LMDZ_sed run.def dayref   ${InitDay}
-    LMDZ_sed run.def anneeref ${InitYear}
+    LMDZ_sed run.def anneeref ${Year}
     LMDZ_sed run.def calend   ${CalendarTypeForLmdz}
     LMDZ_sed run.def nday     ${PeriodLengthInDays}
@@ -109 +109 @@
     LMDZ_sed run.def periodav ${LMDZ_periodav}
     LMDZ_sed run.def adjust   ${LMDZ_adjust}
-
+    LMDZ_sed run.def use_filtre_fft n
     if ( ${FirstInitialize} ) ; then