Changeset 226 for trunk/MESOSCALE/LMD_MM_MARS/makemeso

Timestamp:

Jul 15, 2011, 2:55:17 PM (13 years ago)

Author:

aslmd

Message:

MESOSCALE/LMDZ.MARS.new
--> modified to impact last changes

MESOSCALE/LMD_MM_MARS/makemeso
MESOSCALE/LMD_MM_MARS/SRC/WRFV2/call_meso_physiq?.inc
MESOSCALE/LMD_MM_MARS/SRC/WRFV2/call_meso_inifis?.inc
MESOSCALE/LMD_MM_MARS/SRC/WRFV2/phys/module_lmd_driver.F
--> modified to get rid of ecri_phys

and make changes related to meso_physiq and meso_inifis

LMDZ.MARS/libf/phymars
--> see LMDZ.MARS/README

15/07/2011 == AS

• Modified the mesoscale part so that the previous change by EM does not imply an error in the mesoscale case. More development is needed though to get the "varying z0" capability in the mesoscale model.
• Worked on versions of meso_physiq and meso_inifis as close as possible to physiq and inifis for more continuity in the process of impacting changes (and even possibly to reach a common version of physiq and inifis).

  The main point is to make the mesoscale significant specific parts
  

  coded into include files in meso_inc so that meso_physiq and meso_inifis looks very close to physiq and inifis.

  This is completely transparent for GCM users who does not need the
  

  contents of meso_inc.
• Slight cosmetic changes to physiq.f and inifis.F --- some of them e.g. to prepare convergence between meso_physiq and physiq

File:

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

trunk/MESOSCALE/LMD_MM_MARS/makemeso

@@ -220 +220 @@
           cd Registry ; ln -sf ../mars_lmd_new_${scenario}/Registry.EM . ; cd ..
         fi 
-     ln -sf meso_callkeys_newphys.h meso_callkeys.h
+     #ln -sf meso_callkeys_newphys.h meso_callkeys.h
      cd Registry ; Registry.bash ; cd ..
     else
@@ -310 +310 @@
   echo ${dom} >> last
   echo ${tra} >> last
+  echo ${scat} >> last
   echo ${answer} >> last
-  echo ${scat} >> last
 
 #------------
@@ -580 +580 @@
   \rm dimphys.h 2> /dev/null
   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
+  sed s/--xsize--/${physx}/g meso_inc/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
      ###
@@ -586 +586 @@
      if [[ "${phys}" == "newphys_" ]]
      then
-       touch callkeys.h.meso  
-         ln -sf meso_callkeys.h callkeys.h
+       #touch callkeys.h.meso  
+       #  ln -sf meso_callkeys.h callkeys.h
        #touch dustlift.F.meso 
        #  ln -sf meso_dustlift.F dustlift.F  ## attention avec "ancienne nouvelle physique"