Changeset 1578 for trunk/MESOSCALE/LMD_MM_MARS/makemeso

Timestamp:

Aug 22, 2016, 11:56:58 AM (8 years ago)

Author:

aslmd

Message:

Goal: make the mesoscale model compliant
with new interface philosophy and adapted
to easy interfacing with any physics

Commit 2:

• cleaned makemeso (and removed meso_dimphys.h_ref)
• added linking to phy_common in copy_model
• changed module_lmd_driver.F to reflect that
  • physiq and phys_state_var_init are now within a module
  • their list of arguments changed

NB:

mesoscale model still not working

with HEAD version
... but is now compiling!

need now to fix e.g. geometry

... this will be done within a call
... to the equivalent of iniphysiq
... to make lmd_driver planet-agnostic

retrocompatbility with v1520 is lost

File:

• trunk/MESOSCALE/LMD_MM_MARS/makemeso (modified) (3 diffs)

trunk/MESOSCALE/LMD_MM_MARS/makemeso

@@ -76 +76 @@
 # makemeso -f                ## fresh start [clean -a]
 #
-# makemeso -e                ## a completely new recompile with erasing ALL compiling folder
+# makemeso -e                ## a completely new recompile with erasing the WHOLE compiling folder
 #
 # makemeso -s DUSTSTORM      ## a specific scenario (with precompiling flags)
@@ -250 +250 @@
      cd ..
 
-     # remove files adapted to parallel GCM and useless for mesoscale
-     cd mars_lmd
-     cd libf/phymars
-     \rm tabfi* soil_settings* phyetat0* phyredem* iostart* writediagfi* mkstat* writediagsoil* eofdump* wstats* inistats* mod_*
-     \rm iniphysiq* init_phys_lmdz* comgeomphy* planetwide_mod*
-     mv ../dyn3d/control_mod.F90 .
-     cd ../..
-     cd ..
+     ## remove files adapted to parallel GCM and useless for mesoscale
+     #cd mars_lmd
+     #cd libf/phymars
+     #\rm tabfi* soil_settings* phyetat0* phyredem* iostart* writediagfi* mkstat* writediagsoil* eofdump* wstats* inistats* mod_*
+     #\rm iniphysiq* init_phys_lmdz* comgeomphy* planetwide_mod*
+     #mv ../dyn3d/control_mod.F90 .
+     #cd ../..
+     #cd ..
 
     else
@@ -687 +687 @@
   cd libf/phymars
   \rm dimphys.h 2> /dev/null
-  if [[ "${phys}" == "newphys_" ]]
-  then
-    ln -sf ../../meso_dimphys.h_ref . ## ne sert plus !!
-  else
+#  if [[ "${phys}" == "newphys_" ]]
+#  then
+#    ln -sf ../../meso_dimphys.h_ref . ## ne sert plus !!
+#  else
+  if [[ "${phys}" != "newphys_" ]]
+  then
     physize=$(expr ${physx} \* ${physy})
     sed s/--xsize--/${physx}/g meso_dimphys.h_ref | sed s/--ysize--/${physy}/g | sed s/--physize--/${physize}/g | sed s/--zsize--/${physz}/g | sed s/--soilsize--/${soilsize}/g > dimphys.h
     head -15 dimphys.h
   fi
-     ### TEST new new phys
-     if [[ "${phys}" == "newphys_" ]]
-     then
-       touch gr_fi_dyn.F.lien
-         ln -sf ../dyn3d/gr_fi_dyn.F .  ## dommage, a corriger 
-     ###############################
-     ###############################
-     ###############################
-     fi 
-     ###
-     ###
+     #### TEST new new phys
+     #if [[ "${phys}" == "newphys_" ]]
+     #then
+     #  touch gr_fi_dyn.F.lien
+     #    ln -sf ../dyn3d/gr_fi_dyn.F .  ## dommage, a corriger 
+     ################################
+     ################################
+     ################################
+     #fi 
+     ####
+     ####
   cd ../..