Changeset 1578

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

Location:

trunk/MESOSCALE/LMD_MM_MARS

Files:

• SRC/SCRIPTS/copy_model (modified) (1 diff)
• SRC/WRFV2/mars_lmd_new/libf/phy_common (added)
• SRC/WRFV2/mars_lmd_new/meso_dimphys.h_ref (deleted)
• SRC/WRFV2/phys/module_lmd_driver.F.new (modified) (5 diffs)
• makemeso (modified) (3 diffs)

trunk/MESOSCALE/LMD_MM_MARS/SRC/SCRIPTS/copy_model

@@ -133 +133 @@
 mkdir mars_lmd/libf/phymars
 ln -sf $WRFSRC/WRFV2/mars_lmd/libf/phymars/* mars_lmd/libf/phymars/
+ln -sf $WRFSRC/WRFV2/mars_lmd/libf/phy_common/* mars_lmd/libf/phymars/
 mkdir mars_lmd/libf/dyn3d
 ln -sf $WRFSRC/WRFV2/mars_lmd/libf/dyn3d/* mars_lmd/libf/dyn3d/

trunk/MESOSCALE/LMD_MM_MARS/SRC/WRFV2/phys/module_lmd_driver.F.new

@@ -62 +62 @@
    USE update_outputs_physiq_mod !! to get outputs from physiq
    USE comm_wrf !! to get fields to be written from physiq
+   USE physiq_mod, only : physiq
+   USE phys_state_var_init_mod, only : phys_state_var_init
+   !!! ajouter init_time (voir iniphysiq. ne plus le faire dans la physiq)
 #endif
 
@@ -139 +142 @@
    REAL :: pday,ptime,MY  
    REAL :: phisfi_val
-   LOGICAL :: firstcall,lastcall,tracerdyn
+   LOGICAL :: firstcall,lastcall
    ! ---------- 
    REAL,DIMENSION(:,:),ALLOCATABLE :: pplev,pplay,pphi,pu,pv,pt,pw
@@ -375 +378 @@
 !    pdq(ngrid,nlayermx)        /                                               !
 !    pdpsrf(ngrid)             /                                                !
-!    tracerdyn                 call tracer in dynamical part of GCM ?           !
 !-------------------------------------------------------------------------------!
 ALLOCATE(pdpsrf(ngrid))
@@ -446 +448 @@
   !! parameters are defined in the module_model_constants.F WRF routine
   PRINT *,'** Mars ** INITIALIZE ARRAYS FOR PHYSICS'
+  !! need to get initial time first
+  CALL update_inputs_physiq_time(&
+            JULYR,JULDAY,GMT,&
+            elaps,&
+            lct_input,lon_input,ls_input,&
+            ptime,pday,MY)
+  !!
   CALL phys_state_var_init(ngrid,nlayer,nq,&
+                           floor(pday),ptime,&
                            wdaysec,ptimestep,1/reradius,g,r_d,cp)
   !! Fill planetary parameters in modules
@@ -653 +663 @@
              firstcall,lastcall,pday,ptime,ptimestep, &
              pplev,pplay,pphi,pu,pv,pt,pq,pw,         &
-             pdu,pdv,pdt,pdq,pdpsrf,tracerdyn)
+             pdu,pdv,pdt,pdq,pdpsrf)
 #endif
 

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 ../..