Changeset 1543 for trunk/LMDZ.COMMON/libf/dyn3dpar

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.COMMON/libf/dyn3dpar

Files:

• bands.F90 (modified) (9 diffs)
• gcm.F (modified) (4 diffs)

trunk/LMDZ.COMMON/libf/dyn3dpar/bands.F90

@@ -1 +1 @@
 !
-! $Id: bands.F90 1615 2012-02-10 15:42:26Z emillour $
+! $Id: bands.F90 2351 2015-08-25 15:14:59Z emillour $
 !
   module Bands
@@ -19 +19 @@
   
   subroutine AllocateBands
-    use parallel_lmdz
+    USE parallel_lmdz
     implicit none
     
@@ -33 +33 @@
   
   subroutine Read_distrib
-    use parallel_lmdz
+    USE parallel_lmdz
     implicit none
 
@@ -93 +93 @@
    SUBROUTINE  Set_Bands 
      USE parallel_lmdz
-#ifdef CPP_PHYS
-! Ehouarn: what follows is only related to // physics
-     USE mod_phys_lmdz_para, ONLY : jj_para_begin,jj_para_end
-#endif
      IMPLICIT NONE
      INCLUDE 'dimensions.h'    
-     INTEGER :: i
-        
+     INTEGER :: i, ij
+     INTEGER :: jj_para_begin(0:mpi_size-1)
+     INTEGER :: jj_para_end(0:mpi_size-1)
+       
       do i=0,mpi_size-1
          jj_nb_vanleer2(i)=(jjm+1)/mpi_size
@@ -106 +104 @@
       enddo
           
-#ifdef CPP_PHYS
+      jj_para_begin(0)=1
+      ij=distrib_phys(0)+iim-1
+      jj_para_end(0)=((ij-1)/iim)+1
+      
+      DO i=1,mpi_Size-1
+        ij=ij+1
+        jj_para_begin(i)=((ij-1)/iim)+1
+        ij=ij+distrib_phys(i)-1
+        jj_para_end(i)=((ij-1)/iim)+1
+      ENDDO
+ 
       do i=0,MPI_Size-1
         jj_Nb_physic(i)=jj_para_end(i)-jj_para_begin(i)+1
@@ -127 +135 @@
         endif
       enddo
-#endif      
       
     end subroutine Set_Bands
@@ -134 +141 @@
     subroutine AdjustBands_caldyn
       use times
-      use parallel_lmdz
+      USE parallel_lmdz
       implicit none
 
@@ -199 +206 @@
     subroutine AdjustBands_vanleer
       use times
-      use parallel_lmdz
+      USE parallel_lmdz
       implicit none
 
@@ -265 +272 @@
     subroutine AdjustBands_dissip
       use times
-      use parallel_lmdz
+      USE parallel_lmdz
       implicit none
 

trunk/LMDZ.COMMON/libf/dyn3dpar/gcm.F

@@ -14 +14 @@
       USE parallel_lmdz
       USE infotrac
-#ifdef CPP_PHYS
-      USE mod_interface_dyn_phys
-#endif
+!#ifdef CPP_PHYS
+!      USE mod_interface_dyn_phys
+!#endif
       USE mod_hallo
       USE Bands
@@ -40 +40 @@
       USE mod_phys_lmdz_omp_data, ONLY: klon_omp 
       USE dimphy
-      USE comgeomphy
 #endif
       USE comconst_mod, ONLY: daysec,dtvr,dtphys,rad,g,r,cpp
@@ -196 +195 @@
       call Read_Distrib
 
-#ifdef CPP_PHYS
-        CALL init_phys_lmdz(iim,jjp1,llm,mpi_size,distrib_phys)
+!#ifdef CPP_PHYS
+!        CALL init_phys_lmdz(iim,jjp1,llm,mpi_size,distrib_phys)
 !#endif
 !      CALL set_bands
 !#ifdef CPP_PHYS
-      CALL Init_interface_dyn_phys
-#endif
+!      CALL Init_interface_dyn_phys
+!#endif
       CALL barrier
 
@@ -497 +496 @@
 !     &                latfi,lonfi,airefi,zcufi,zcvfi,rad,g,r,cpp,
 !     &                iflag_phys)
-         CALL iniphysiq(iim,jjm,llm,daysec,day_ini,dtphys/nsplit_phys,
+         CALL iniphysiq(iim,jjm,llm,
+     &                distrib_phys(mpi_rank),comm_lmdz,
+     &                daysec,day_ini,dtphys/nsplit_phys,
      &                rlatu,rlatv,rlonu,rlonv,aire,cu,cv,rad,g,r,cpp,
      &                iflag_phys)