Changeset 2599 for LMDZ5

Timestamp:

Jul 22, 2016, 4:05:15 PM (8 years ago)

Author:

Ehouarn Millour

Message:

Update for phymar which should have been done with revision 2315.
Introduce module vertical_layers_mod to store information on the
vertical grid to be used within the physics (rather than including
the dynamics-related comvert.h).
EM

Location:

LMDZ5/trunk/libf

Files:

• dynphy_lonlat/phymar/iniphysiq_mod.F90 (modified) (3 diffs)
• phymar/iophys.F90 (modified) (3 diffs)
• phymar/physiq_mod.F90 (modified) (2 diffs)
• phymar/vertical_layers_mod.F90 (added)

LMDZ5/trunk/libf/dynphy_lonlat/phymar/iniphysiq_mod.F90

@@ -13 +13 @@
   USE dimphy, ONLY: init_dimphy
   USE inigeomphy_mod, ONLY: inigeomphy
+  USE vertical_layers_mod, ONLY : init_vertical_layers
   USE infotrac, ONLY: nqtot
   USE comcstphy, ONLY: rradius, & ! planet radius (m)
@@ -28 +29 @@
  
  
+  include "dimensions.h"
+  include "comvert.h"
   include "iniprint.h"
 
@@ -69 +72 @@
 !$OMP PARALLEL
 
+  ! copy over preff , ap(), bp(), etc 
+  CALL init_vertical_layers(nlayer,preff,scaleheight, &
+                            ap,bp,presnivs,pseudoalt)
+
   ! Initialize tracer names, numbers, etc. for physics
   CALL init_infotrac_phy(nqtot)

LMDZ5/trunk/libf/phymar/iophys.F90

@@ -69 +69 @@
       SUBROUTINE iophys_ini
       USE mod_phys_lmdz_para
+      USE vertical_layers_mod, ONLY: presnivs
+      USE regular_lonlat_mod, ONLY: lon_reg, lat_reg
+      USE dimphy, ONLY: klev
 
       IMPLICIT NONE
@@ -88 +91 @@
 !   -------------
 
-#include "dimensions.h"
-#include "paramet.h"
-#include "comgeom.h"
-#include "comvert.h"
-
 real pi
 
@@ -102 +100 @@
 pi=2.*asin(1.)
 call iotd_ini('phys.nc   ', &
-iim,jjp1,llm,rlonv(1:iim)*180./pi,rlatu*180./pi,presnivs)
+!iim,jjp1,llm,rlonv(1:iim)*180./pi,rlatu*180./pi,presnivs)
+size(lon_reg),size(lat_reg),klev,lon_reg(:)*180./pi,lat_reg*180./pi,presnivs)
     ENDIF
 !$OMP END MASTER

LMDZ5/trunk/libf/phymar/physiq_mod.F90

@@ -29 +29 @@
       USE mod_phys_lmdz_para, only : jj_nb
       USE phys_state_var_mod, only : phys_state_var_init
+      USE vertical_layers_mod, ONLY: ap, bp
 ! Modules LMDZ utilisés pour LMDZ-MAR:
       USE control_mod      
@@ -52 +53 @@
 #include "dimensions.h"
 ! Include LMDZ utilisés ici pour MAR-LMDZ:
-#include "comvert.h"
 #include "YOMCST.h"