Changeset 1543 for trunk/LMDZ.GENERIC/libf/phystd/dyn1d

Timestamp:

Apr 22, 2016, 9:02:11 AM (9 years ago)

Author:

emillour

Message:

All models: Further adaptations to keep up with changes in LMDZ5 concerning
physics/dynamics separation:

• dyn3d:
• adapted gcm.F so that all physics initializations are now done in iniphysiq.

• dyn3dpar:
• adapted gcm.F so that all physics initializations are now done in iniphysiq.
• updated calfis_p.F to follow up with changes.
• copied over updated "bands.F90" from LMDZ5.

• dynphy_lonlat:
• calfis_p.F90, mod_interface_dyn_phys.F90, follow up of changes in phy_common/mod_* routines

• phy_common:
• added "geometry_mod.F90" to store information about the grid (replaces phy*/comgeomphy.F90) and give variables friendlier names: rlond => longitude , rlatd => latitude, airephy => cell_area, cuphy => dx , cvphy => dy
• added "physics_distribution_mod.F90"
• updated "mod_grid_phy_lmdz.F90", "mod_phys_lmdz_mpi_data.F90", "mod_phys_lmdz_para.F90", "mod_phys_lmdz_mpi_transfert.F90", "mod_grid_phy_lmdz.F90", "mod_phys_lmdz_omp_data.F90", "mod_phys_lmdz_omp_transfert.F90", "write_field_phy.F90" and "ioipsl_getin_p_mod.F90" to LMDZ5 versions.

• phy[venus/titan/mars/std]:
• removed "init_phys_lmdz.F90", "comgeomphy.F90"; adapted routines to use geometry_mod (longitude, latitude, cell_area, etc.)

EM

Location:

trunk/LMDZ.GENERIC/libf/phystd/dyn1d

Files:

• mod_interface_dyn_phys.F90 (added)
• rcm1d.F (modified) (6 diffs)

trunk/LMDZ.GENERIC/libf/phystd/dyn1d/rcm1d.F

@@ -3 +3 @@
 ! to use  'getin'
       use ioipsl_getincom, only: getin
+      use dimphy, only : init_dimphy
+      use mod_grid_phy_lmdz, only : regular_lonlat
       use infotrac, only: nqtot, tname
       use surfdat_h, only: albedodat, phisfi, dryness, watercaptag,
@@ -9 +11 @@
      &                     dtemisice
       use comdiurn_h, only: sinlat, coslat, sinlon, coslon
-!      use comsaison_h
       use comsoil_h, only: nsoilmx, layer, mlayer, inertiedat, volcapa
       use phyredem, only: physdem0,physdem1
-      use comgeomphy, only: initcomgeomphy, cell_area
+      use geometry_mod, only: init_geometry
       use slab_ice_h, only: noceanmx
       use planete_mod, only: apoastr,periastr,year_day,peri_day,
@@ -27 +28 @@
       use regular_lonlat_mod, only: init_regular_lonlat
       use planete_mod, only: ini_planete_mod
+      use physics_distribution_mod, only: init_physics_distribution
+      use regular_lonlat_mod, only: init_regular_lonlat
+      use mod_interface_dyn_phys, only: init_interface_dyn_phys
       use inifis_mod, only: inifis
       implicit none
@@ -133 +137 @@
       character*20,allocatable :: nametrac(:)   ! name of the tracer (no need for adv trac common)
 
-      real :: latitude(1), longitude(1)
+      real :: latitude(1), longitude(1), cell_area(1)
 
 c=======================================================================
@@ -140 +144 @@
 ! initialize "serial/parallel" related stuff
 !      CALL init_phys_lmdz(iim,jjm+1,llm,1,(/(jjm-1)*iim+2/))
-      CALL init_phys_lmdz(1,1,llm,1,(/1/))
-      call initcomgeomphy
+!      CALL init_phys_lmdz(1,1,llm,1,(/1/))
+!      call initcomgeomphy
 
       !! those are defined in surfdat_h.F90
@@ -490 +494 @@
 
       ! initializations, as with iniphysiq.F90 for the 3D GCM
+      call init_physics_distribution(regular_lonlat,4,
+     &                               1,1,1,nlayer,1)
+      call init_interface_dyn_phys
       CALL init_regular_lonlat(1,1,longitude,latitude,
      &                   (/0.,0./),(/0.,0./))
-      
+      call init_geometry(1,longitude,latitude,
+     &                   (/0.,0.,0.,0./),(/0.,0.,0.,0./),
+     &                   cell_area)
+      call init_dimphy(1,nlayer) ! Initialize dimphy module
       call ini_planete_mod(nlayer,preff,ap,bp)