Changeset 1573 for trunk/LMDZ.MARS/libf

Timestamp:

Jul 12, 2016, 3:17:48 PM (9 years ago)

Author:

emillour

Message:

All GCMS:
Cleanup concerning iniphysiq/inigeomphy initializations: initializations
related to routines in phy_common or dynphy_lonlat can be done in
inigeomphy, but any initialization for modules/routines in a physics
package (directory phy*) must be done in the related phy*/iniphysiq
routine.
EM

Location:

trunk/LMDZ.MARS/libf/dynphy_lonlat

Files:

• inigeomphy_mod.F90 (modified) (3 diffs)
• phymars/iniphysiq_mod.F90 (modified) (4 diffs)

trunk/LMDZ.MARS/libf/dynphy_lonlat/inigeomphy_mod.F90

@@ -6 +6 @@
                      nbp, communicator, &
                      rlatu,rlatv,rlonu,rlonv,aire,cu,cv)
-  USE dimphy, ONLY: init_dimphy
   USE mod_grid_phy_lmdz, ONLY: klon_glo,  & ! number of atmospheric columns (on full grid)
                                regular_lonlat, &  ! regular longitude-latitude grid type
@@ -15 +14 @@
                                 klon_mpi_begin ! start indes of columns (on local mpi grid)
   USE geometry_mod, ONLY : init_geometry
-!  USE comgeomphy, ONLY: initcomgeomphy, &
-!                        airephy, & ! physics grid area (m2)
-!                        cuphy, & ! cu coeff. (u_covariant = cu * u)
-!                        cvphy, & ! cv coeff. (v_covariant = cv * v)
-!                        rlond, & ! longitudes
-!                        rlatd ! latitudes
   USE physics_distribution_mod, ONLY : init_physics_distribution
   USE regular_lonlat_mod, ONLY : init_regular_lonlat, &
@@ -220 +213 @@
                      airefi,cufi,cvfi)
 
-
-  ! Initialize dimphy module
-  CALL init_dimphy(klon_omp,nlayer)
-
 !$OMP END PARALLEL
 

trunk/LMDZ.MARS/libf/dynphy_lonlat/phymars/iniphysiq_mod.F90

@@ -20 +20 @@
 ! necessary to get klon_omp
 USE mod_phys_lmdz_para, ONLY: klon_omp ! number of columns (on local omp grid)
+USE dimphy, ONLY: init_dimphy
 
 implicit none
@@ -49 +50 @@
   !------------------------------------------
   ! --> initialize physics distribution, global fields and geometry
+  ! (i.e. things in phy_common or dynphy_lonlat)
   CALL inigeomphy(ii,jj,nlayer, &
                nbp, communicator, &
@@ -55 +57 @@
                airedyn,cudyn,cvdyn)
 
-  ! the distinct part for all planetary physics
+  ! the distinct part for all planetary physics (ie. things in phymars)
   !------------------------------------------
 
@@ -62 +64 @@
 ! copy some fundamental parameters to physics 
 ! and do some initializations 
+
+! Initialize dimphy module
+call init_dimphy(klon_omp,nlayer)
 
 call phys_state_var_init(klon_omp,nlayer,nqtot, &