Changeset 1579 for trunk

Timestamp:

Aug 23, 2016, 8:04:18 AM (9 years ago)

Author:

aslmd

Message:

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

Commit 3: call to iniphysiq in module_lmd_driver

• iniphysiq is in WRFV2/phys
• geometry is initialized in update_inputs_physiq_mod

This call is planet-independent and follows the
same philosophy as iniphysiq in dynphy_lonlat
for the LMDz GCM

NB: mesoscale model now compiles and runs with HEAD version
results completely compatible with v1520 version (same physics)

Location:

trunk

Files:

• LMDZ.MARS/libf/phymars/conf_phys.F (modified) (2 diffs)
• LMDZ.MARS/libf/phymars/physiq_mod.F (modified) (2 diffs)
• MESOSCALE/LMD_MM_MARS/SRC/WRFV2/phys/Makefile (modified) (1 diff)
• MESOSCALE/LMD_MM_MARS/SRC/WRFV2/phys/module_lmd_driver.F.new (modified) (2 diffs)
• MESOSCALE/LMD_MM_MARS/SRC/WRFV2/phys/update_inputs_physiq_mod.F (modified) (2 diffs)

trunk/LMDZ.MARS/libf/phymars/conf_phys.F

@@ -54 +54 @@
       CHARACTER ch1*12
 
+#ifndef MESOSCALE
       ! read in some parameters from "run.def" for physics,
       ! or shared between dynamics and physics.
@@ -65 +66 @@
       ecritstart=0 ! default value
       call getin("ecritstart",ecritstart) ! write a restart every ecristart steps
+#endif
+
 ! --------------------------------------------------------------
 !  Reading the "callphys.def" file controlling some key options

trunk/LMDZ.MARS/libf/phymars/physiq_mod.F

@@ -412 +412 @@
 #else
 ! MESOSCALE. Supposedly everything is already set in modules.
-! So we just check. And we calculate day_ini + two param in dyn3d/control_mod.
+! So we just check. And we fill day_ini
+      print*,"check: --- in physiq.F"
       print*,"check: rad,cpp,g,r,rcp,daysec"
       print*,rad,cpp,g,r,rcp,daysec
@@ -424 +425 @@
       PRINT*,'check: qsurf ',qsurf(1,1),qsurf(ngrid,nq)
       PRINT*,'check: co2 ',co2ice(1),co2ice(ngrid)
-      day_step=daysec/ptimestep
-      PRINT*,'Call to LMD physics:',day_step,' per Martian day'
-      iphysiq=ptimestep
+      !!!
       day_ini = pday
 #endif

trunk/MESOSCALE/LMD_MM_MARS/SRC/WRFV2/phys/Makefile

@@ -11 +11 @@
         update_inputs_physiq_mod.o \
         update_outputs_physiq_mod.o \
+        iniphysiq_mod.o \
         module_lmd_driver.o 
  

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 iniphysiq_mod !! to get iniphysiq subroutine
    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
 
@@ -454 +453 @@
             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
   !! Values defined in the module_model_constants.F WRF routine
   CALL update_inputs_physiq_constants
-  !! Read callphys.def !!
-  call conf_phys(ngrid,nlayer,nq)
+  !! Initialize physics
+  CALL iniphysiq(ngrid,nlayer,nq,ptime,wappel_phys,&
+                     wdaysec,floor(pday),ptimestep, &
+                     1./reradius,g,r_d,cp,1)
 ENDIF allocation_firstcall
 #endif

trunk/MESOSCALE/LMD_MM_MARS/SRC/WRFV2/phys/update_inputs_physiq_mod.F

@@ -227 +227 @@
             XLAT,XLONG)
 
+   ! in WRF (share)
    USE module_model_constants, only: DEGRAD
+   ! in LMD (phymars)
    use comgeomfi_h, only: ini_fillgeom
+   ! in LMD (phy_common)
+   USE mod_grid_phy_lmdz, ONLY: init_grid_phy_lmdz
+   USE geometry_mod, ONLY: latitude,latitude_deg,&
+                           longitude,longitude_deg,&
+                           cell_area
 
    INTEGER, INTENT(IN) :: ims,ime,jms,jme
@@ -273 +280 @@
    !! FILL GEOMETRICAL ARRAYS !!
    call ini_fillgeom(ngrid,plat,plon,parea)
+
+   !!! ----------------------------------------------------------
+   !!! --- initializing geometry in phy_common
+   !!! --- (this is quite planet-independent)
+   !!! ----------------------------------------------------------
+   ! initialize mod_grid_phy_lmdz
+   CALL init_grid_phy_lmdz(1,1,ipe-ips+1,jpe-jps+1,nlayer)
+   ! fill in geometry_mod variables
+   ! ... copy over local grid longitudes and latitudes
+   ! ... partly what is done in init_geometry
+   IF(.not.ALLOCATED(longitude)) ALLOCATE(longitude(ngrid))
+   IF(.not.ALLOCATED(longitude_deg)) ALLOCATE(longitude_deg(ngrid))
+   IF(.not.ALLOCATED(latitude)) ALLOCATE(latitude(ngrid))
+   IF(.not.ALLOCATED(latitude_deg)) ALLOCATE(latitude_deg(ngrid))
+   IF(.not.ALLOCATED(cell_area)) ALLOCATE(cell_area(ngrid))
+   longitude(:) = plon(:)
+   latitude(:) = plat(:)
+   longitude_deg(:) = plon(:)/DEGRAD
+   latitude_deg(:) = plat(:)/DEGRAD
+   cell_area(:) = parea(:)
+   !!! ----------------------------------------------------------
 
 END SUBROUTINE update_inputs_physiq_geom