Changeset 1573 for trunk/LMDZ.COMMON/libf/dynphy_lonlat

Timestamp:

Jul 12, 2016, 3:17:48 PM (8 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.COMMON/libf/dynphy_lonlat

Files:

• inigeomphy_mod.F90 (modified) (3 diffs)
• phytitan/iniphysiq_mod.F90 (modified) (3 diffs)
• phyvenus/iniphysiq_mod.F90 (modified) (3 diffs)

trunk/LMDZ.COMMON/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.COMMON/libf/dynphy_lonlat/phytitan/iniphysiq_mod.F90

@@ -17 +17 @@
   USE inigeomphy_mod, ONLY: inigeomphy
   USE control_mod, ONLY: nday
+  USE dimphy, ONLY: init_dimphy
+  USE mod_phys_lmdz_para, ONLY: klon_omp ! number of columns (on local omp grid)
   IMPLICIT NONE
 
@@ -54 +56 @@
   !------------------------------------------
   ! --> initialize physics distribution, global fields and geometry
+  ! (i.e. things in phy_common or dynphy_lonlat)
   CALL inigeomphy(ii,jj,nlayer, &
                nbp, communicator, &
@@ -60 +63 @@
                airedyn,cudyn,cvdyn)
 
-  ! the distinct part for all planetary physics
+  ! the distinct part for all planetary physics  (ie. things in phytitan)
   !------------------------------------------
 
 !$OMP PARALLEL
+
+  ! Initialize dimphy module
+  call init_dimphy(klon_omp,nlayer)
 
   ! Initialize some physical constants

trunk/LMDZ.COMMON/libf/dynphy_lonlat/phyvenus/iniphysiq_mod.F90

@@ -16 +16 @@
   USE time_phylmdz_mod, ONLY: init_time
   USE inigeomphy_mod, ONLY: inigeomphy
+  USE dimphy, ONLY: init_dimphy
+  USE mod_phys_lmdz_para, ONLY: klon_omp ! number of columns (on local omp grid)
   IMPLICIT NONE
 
@@ -53 +55 @@
   !------------------------------------------
   ! --> initialize physics distribution, global fields and geometry
+  ! (i.e. things in phy_common or dynphy_lonlat)
   CALL inigeomphy(ii,jj,nlayer, &
                nbp, communicator, &
@@ -59 +62 @@
                airedyn,cudyn,cvdyn)
 
-  ! the distinct part for all planetary physics
+  ! the distinct part for all planetary physics (ie. things in phyvenus)
   !------------------------------------------
 
 !$OMP PARALLEL
+
+  ! Initialize dimphy module
+  call init_dimphy(klon_omp,nlayer)
 
   ! Initialize some physical constants