Changeset 1621 for trunk/LMDZ.MARS/libf/phymars/dyn1d

Timestamp:

Oct 25, 2016, 9:23:21 AM (9 years ago)

Author:

emillour

Message:

Further work on full dynamics/physics separation.

LMDZ.COMMON:

• added phy_common/vertical_layers_mod.F90 to store information on vertical grid. This is where routines in the physics should get the information.
• The contents of vertical_layers_mod intialized via dynphy_lonlat/inigeomphy_mod.F90.

LMDZ.MARS:

• physics now completely decoupled from dynamics; the physics package may now be compiled as a library (-libphy option of makelmdz_fcm).
• created an "ini_tracer_mod" routine in module "tracer_mod" for a cleaner initialization of the later.
• removed some purely dynamics-related outputs (etot0, zoom parameters, etc.) from diagfi.nc and stats.nc outputs as these informations are not available in the physics.

LMDZ.GENERIC:

• physics now completely decoupled from dynamics; the physics package may now be compiled as a library (-libphy option of makelmdz_fcm).
• added nqtot to tracer_h.F90.
• removed some purely dynamics-related outputs (etot0, zoom parameters, etc.) from diagfi.nc and stats.nc outputs as these informations are not available in the physics.

LMDZ.VENUS:

• physics now completely decoupled from dynamics; the physics package may now be compiled as a library (-libphy option of makelmdz_fcm).
• added infotrac_phy.F90 to store information on tracers in the physics. Initialized via iniphysiq.
• added cpdet_phy_mod.F90 to store t2tpot etc. functions to be used in the physics. Initialized via iniphysiq. IMPORTANT: there are some hard-coded constants! These should match what is in cpdet_mod.F90 in the dynamics.
• got rid of references to moyzon_mod module within the physics. The required variables (tmoy, plevmoy) are passed to the physics as arguments to physiq.

LMDZ.TITAN:

• added infotrac_phy.F90 to store information on tracers in the physics. Initialized via iniphysiq.
• added cpdet_phy_mod.F90 to store t2tpot etc. functions to be used in the physics.
• Extra work required to completely decouple physics and dynamics: moyzon_mod should be cleaned up and information passed from dynamics to physics as as arguments. Likewise moyzon_ch and moyzon_mu should not be queried from logic_mod (which is in the dynamics).

EM

File:

• trunk/LMDZ.MARS/libf/phymars/dyn1d/testphys1d.F (modified) (5 diffs)

trunk/LMDZ.MARS/libf/phymars/dyn1d/testphys1d.F

@@ -21 +21 @@
      &                            ecritphy, iphysiq
       use dimradmars_mod, only: tauscaling,tauvis
-      USE comvert_mod, ONLY: ap,bp,aps,bps,pa,preff,sig
+      USE comvert_mod, ONLY: ap,bp,aps,bps,pa,preff,sig,
+     &                       presnivs,pseudoalt,scaleheight
+      USE vertical_layers_mod, ONLY: init_vertical_layers
       USE logic_mod, ONLY: hybrid
       use physics_distribution_mod, only: init_physics_distribution
@@ -49 +51 @@
 c=======================================================================
 
-#include "dimensions.h"
+      include "dimensions.h"
       integer, parameter :: ngrid = 1 !(2+(jjm-1)*iim - 1/jjm)
       integer, parameter :: nlayer = llm
@@ -58 +60 @@
 !#include "comsoil.h"
 !#include "comdiurn.h"
-#include "callkeys.h"
+      include "callkeys.h"
 !#include "comsaison.h"
 !#include "control.h"
-#include "netcdf.inc"
-#include "comg1d.h"
+      include "netcdf.inc"
+      include "comg1d.h"
 !#include "advtrac.h"
 
@@ -494 +496 @@
      &                   (/0.,0.,0.,0./),(/0.,0.,0.,0./),
      &                   cell_area)
+! Ehouarn: init_vertial_layers called later (because disvert not called yet)
+!      call init_vertical_layers(nlayer,preff,scaleheight,
+!     &                      ap,bp,aps,bps,presnivs,pseudoalt)
       call init_dimphy(1,nlayer) ! Initialize dimphy module
-      call phys_state_var_init(1,llm,nq,
+      call phys_state_var_init(1,llm,nq,tname,
      .          day0,time,daysec,dtphys,rad,g,r,cpp)
       call ini_fillgeom(1,latitude,longitude,(/1.0/))
@@ -611 +616 @@
 
       CALL  disvert
+      ! now that disvert has been called, initialize module vertical_layers_mod
+      call init_vertical_layers(nlayer,preff,scaleheight,
+     &                      ap,bp,aps,bps,presnivs,pseudoalt)
 
       DO ilevel=1,nlevel