Changeset 1512

Timestamp:

07/15/11 10:45:11 (13 years ago)

Author:

jgipsl

Message:

• Added switch between old and new physics in LMDZ :

In lmdz.card, put LMDZ_Physics=AP for old physics or LMDZ_Physics=NPv3.0
to new physics. If LMDZ_Physics is not present in lmdz.card, default
value AP will be used. NB : new physics is still under work and the
parameters may change.

Added suffix _AP for old physiq.def files
Added physiq.def_L39_NPv3.0 : the beginning of this file correspond to
config.def and the end to physiq.def_L39_NPv3.0 in IPSLCM5B
configuration

• Changed to ok_ade=ok_aie=y for very basse resolution 32x24x11 : the aerososls for Historical run now available at this resolution.

• Changed default value for RebuildFromArchive?, now NONE

Location:

CONFIG/LMDZOR/branches/LMDZOR_v4/LMDZOR

Files:

• COMP/lmdz.card_AMIP (modified) (2 diffs)
• COMP/lmdz.card_Climat (modified) (2 diffs)
• COMP/lmdz.driver (modified) (3 diffs)
• PARAM/physiq.def_L11_AP (moved) (moved from CONFIG/LMDZOR/branches/LMDZOR_v4/LMDZOR/PARAM/physiq.def_L11) (1 diff)
• PARAM/physiq.def_L19_AP (moved) (moved from CONFIG/LMDZOR/branches/LMDZOR_v4/LMDZOR/PARAM/physiq.def_L19)
• PARAM/physiq.def_L39_AP (moved) (moved from CONFIG/LMDZOR/branches/LMDZOR_v4/LMDZOR/PARAM/physiq.def_L39)
• PARAM/physiq.def_L39_NPv3.0 (added)
• config.card (modified) (1 diff)

CONFIG/LMDZOR/branches/LMDZOR_v4/LMDZOR/COMP/lmdz.card_AMIP

@@ -5 +5 @@
 
 [UserChoices]
+# Physics package to use : AP for standard/old physics(defalut) or NPv3.0 for new physics
+LMDZ_Physics=AP
+#LMDZ_Physics=NPv3.0
+
 # You can choose here the name of create_etat0 you want to use
 # If noting is defined here, the job will get the JobName in the file  ../CREATE/config.card
@@ -59 +63 @@
 
 [ParametersFiles]
-List=   (${SUBMIT_DIR}/PARAM/physiq.def_L${RESOL_ATM_Z}, physiq.def), \
+List=   (${SUBMIT_DIR}/PARAM/physiq.def_L${RESOL_ATM_Z}_${LMDZ_Physics}, physiq.def), \
         (${SUBMIT_DIR}/PARAM/gcm.def_${RESOL_ATM_3D},    gcm.def),    \
         (${SUBMIT_DIR}/PARAM/cosp_input_nl.txt,                .),    \

CONFIG/LMDZOR/branches/LMDZOR_v4/LMDZOR/COMP/lmdz.card_Climat

@@ -5 +5 @@
 
 [UserChoices]
+# Physics package to use : AP for standard/old physics(defalut) or NPv3.0 for new physics
+LMDZ_Physics=AP
+#LMDZ_Physics=NPv3.0
+
 # You can choose here the name of create_etat0 you want to use
 # If noting is defined here, the job will get the JobName in the file  ../CREATE/config.card
@@ -47 +51 @@
 
 [ParametersFiles]
-List=   (${SUBMIT_DIR}/PARAM/physiq.def_L${RESOL_ATM_Z}, physiq.def), \
+List=   (${SUBMIT_DIR}/PARAM/physiq.def_L${RESOL_ATM_Z}_${LMDZ_Physics}, physiq.def), \
         (${SUBMIT_DIR}/PARAM/gcm.def_${RESOL_ATM_3D},    gcm.def),    \
         (${SUBMIT_DIR}/PARAM/cosp_input_nl.txt,                .),    \

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

@@ +1 @@
+
 # $Id$
 #
@@ -37 +38 @@
             CalendarTypeForLmdz=earth_360d
     esac
+
+
+        
+    ##- LMDZ physics version
+    ##  Read LMDZ_Physics option in lmdz.card, if not present take default value AP (old physics) 
+    if [ ! X${lmdz_UserChoices_LMDZ_Physics} = X ] ; then
+        LMDZ_Physics=${lmdz_UserChoices_LMDZ_Physics}
+    else
+        LMDZ_Physics=AP
+    fi
+    echo LMDZ physics version : ${LMDZ_Physics}
+
+
 
     ##- Create_etat0_limit version
@@ -199 +213 @@
     fi
 
-    ## gcm.def parameters : no change since gcm.def_${RESOL_ATM_3D} is used and already modified
+    ## gcm.def parameters : 
+    # Modification only for new physics
+    if [ X${LMDZ_Physics} = X"NPv3.0" ] ; then
+        LMDZ_sed gcm.def iphysiq     5
+    fi
 
     ## run.def parameters

CONFIG/LMDZOR/branches/LMDZOR_v4/LMDZOR/PARAM/physiq.def_L11_AP

@@ -165 +165 @@
 #
 ### ok_ade=y/n   flag Aerosol direct effect
-ok_ade=n
+ok_ade=y
 ### ok_aie=y/n   flag Aerosol indirect effect
-ok_aie=n
+ok_aie=y
 ### aer_type =   Aerosol variation type : actuel / preind / scenario / annuel
 # variable modife avec lmdz.card

CONFIG/LMDZOR/branches/LMDZOR_v4/LMDZOR/config.card

@@ -129 +129 @@
 RebuildFrequency=1Y
 #D- Do we rebuild parallel output from archive (use NONE to use SCRATCHDIR as buffer)
-RebuildFromArchive=true
+RebuildFromArchive=NONE
 #D- If you want to produce time series, this flag determines
 #D- frequency of post-processing submission (NONE if you don't want)