Changeset 54 for trunk/mesoscale/LMD_MM_MARS/makemeso

Timestamp:

Feb 2, 2011, 10:14:07 PM (14 years ago)

Author:

aslmd

Message:

---

LMD_LES_MARS: Tests with new physics in unified frame
M 53 mesoscale/LMD_LES_MARS/modif_mars/module_model_constants.F
M 53 mesoscale/LMD_LES_MARS/modif_mars/module_first_rk_step_part1.F
M 53 mesoscale/LMD_MM_MARS/SRC/WRFV2/phys/module_lmd_driver.F
Modifications made to cope with new soil scheme

M 53 mesoscale/LMD_MM_MARS/SRC/WRFV2/mars_lmd/libf/phymars/meso_physiq.F
Commented aeronomars in old physics so that the model can compile with lots of grid points

---

LMD_MM_MARS: Implement tracers with the new physics. Test with JBM runs with 5 tracers

including radiatively active dust and water ice

TODO: propagate reading "traceur.def" and few initialisations from

testphys1d.F into module_lmd_driver.F

M 53 mars/libf/phymars/dimradmars.h
M 53 mars/libf/phymars/callradite.F
Change it back to both dust and ice radiatively active

M 53 mesoscale/LMD_MM_MARS/makemeso
Allow to "fresh start" with the inclusion of "clean -a" in the script

M 53 mesoscale/LMD_MM_MARS/SRC/WRFV2/Registry/Registry.EM
M 53 mesoscale/LMD_MM_MARS/SRC/WRFV2/dyn_em/module_initialize_real.F
M 53 mesoscale/LMD_MM_MARS/SRC/WRFV2/dyn_em/solve_em.F
M 53 mesoscale/LMD_MM_MARS/SRC/WRFV2/main/real_em.F
M 53 mesoscale/LMD_MM_MARS/SIMU/runmeso
Added the option mars==11 with 5 tracers: CO2 H2Ovap H2Oice DUST DUSTN
-- Note that the order matters for H2Ovap and H2Oice

LMD_MM_MARS: Create a folder to run LMD GCM with exact same physics as mesoscale

A 0 mesoscale/LMDZ.MARS/libf/phymars/physiq.F
All files in mesoscale/LMDZ.MARS/libf are links except this one
--> Because specific WRITEDIAGFI commands are set to output what is needed PREP_MARS
--> Something must be done so that qCO2, qdust, qdustN can be propagated too !!!

A 0 mesoscale/LMDZ.MARS/libf_gcm
A 0 mesoscale/LMDZ.MARS/in_lmdz_mars_newphys
Two important links that must not be broken

A 0 mesoscale/LMDZ.MARS/myGCM
This folder is for runs. Only links here -- except temp files which are not synchronized.

M 53 mesoscale/LMD_MM_MARS/SIMU/in_lmdz_mars_newphys/compile
A 0 mesoscale/LMD_MM_MARS/SIMU/in_lmdz_mars_newphys/myGCM/run.def
A 0 mesoscale/LMD_MM_MARS/SIMU/in_lmdz_mars_newphys/myGCM/traceur.def
M 53 mesoscale/LMD_MM_MARS/SIMU/in_lmdz_mars_newphys/myGCM/callphys.def
A 0 mesoscale/LMD_MM_MARS/SIMU/in_lmdz_mars_newphys/myGCM/callphys.def.csttau
Those files are needed to run the GCM in order to prepare initial & boundary

conditions for the mesoscale... but basically it is the exact same GCM

--> compile is a convenient script

A 0 mesoscale/LMDZ.MARS/makegcm
A 0 mesoscale/LMDZ.MARS/makegcm_g95
A 0 mesoscale/LMDZ.MARS/create_make_gcm
This is supposed to be merged one day with files in trunk/mars/

A 0 mesoscale/LMDZ.MARS/myGCM/DEFS_JB
Necessary files to restart a GCM run corresponding to new water cycle in JB's thesis

File:

• trunk/mesoscale/LMD_MM_MARS/makemeso (modified) (4 diffs)

trunk/mesoscale/LMD_MM_MARS/makemeso

@@ -52 +52 @@
 justphys=0
 debug=0
+fresh_start=0
 phys=""
-while getopts "drc:njhgp" options; do
+while getopts "drc:njhgpf" options; do
   case $options in
    d ) donotcompile=1;;     ## just to check the compile folder
@@ -61 +62 @@
    j ) justphys=1;;         ## just compile LMD physics
    g ) debug=1;;            ## debug mode
-   p ) phys="newphys_";;
+   p ) phys="newphys_";;    ## with new physics
+   f ) fresh_start=1;;      ## a fresh start
    h ) echo "
 # Use:    
@@ -83 +85 @@
 #
 # makemeso -p                ## with new LMD physics
+#
+# makemeso -f                ## fresh start [clean -a]
 " ; exit ;;
   esac
@@ -185 +189 @@
     if [[ "${phys}" == "newphys_" ]]
     then
-    sed s+"mars_lmd"+"mars_lmd_new"+g copy_model > copy_model_tmp
-    chmod 755 copy_model_tmp
-    ./copy_model_tmp
-    \rm copy_model_tmp
-    mv WRFV2 ${conf_wrf}/
-    cd ${conf_wrf}/WRFV2
-    ln -sf mars_lmd_new mars_lmd
-    ln -sf meso_callkeys_newphys.h meso_callkeys.h
-    cd Registry ; Registry.bash ; cd ..
+     sed s+"mars_lmd"+"mars_lmd_new"+g copy_model > copy_model_tmp
+     chmod 755 copy_model_tmp
+     ./copy_model_tmp
+     \rm copy_model_tmp
+     mv WRFV2 ${conf_wrf}/
+     cd ${conf_wrf}/WRFV2
+     ln -sf mars_lmd_new mars_lmd
+     ln -sf meso_callkeys_newphys.h meso_callkeys.h
+     cd Registry ; Registry.bash ; cd ..
     else
-    ./copy_model
-    mv WRFV2 ${conf_wrf}/
-    cd ${conf_wrf}/WRFV2
-    cd Registry ; Registry.bash ; cd .. 
-    fi
+     ./copy_model
+     mv WRFV2 ${conf_wrf}/
+     cd ${conf_wrf}/WRFV2
+     cd Registry ; Registry.bash ; cd .. 
+     fi
   else
     cd ${conf_wrf}/WRFV2 
-    echo Did you modify anything in the Registry or clean ? y for yes, any key for no ; read answer
-    case ${answer} in
-      y) cd Registry ; mv Registry Registry.bak ; Registry.bash ; cd .. ;;
-      *) answer='no' ;;
-    esac 
+    if [ ${fresh_start} -eq 1 ] 
+    then
+      echo '*** FRESH START, I clean everything'
+      clean -a > /dev/null 2> /dev/null
+      cd Registry ; mv Registry Registry.bak ; Registry.bash ; cd ..
+      answer='y' ## a voir... pas si sur
+    else
+      echo Did you modify anything in the Registry or clean ? y for yes, any key for no ; read answer
+      case ${answer} in
+        y) cd Registry ; mv Registry Registry.bak ; Registry.bash ; cd .. ;;
+        *) answer='no' ;;
+      esac
+    fi 
   fi
   # summary