Changeset 2351 for LMDZ5/trunk/libf/dyn3dmem

Timestamp:

Aug 25, 2015, 5:14:59 PM (9 years ago)

Author:

Ehouarn Millour

Message:

More on physics/dynamics separation and cleanup:

• Set things up so that all physics-related initializations are done via iniphysiq.
• Created a "geometry_mod.F90" module in phy_common to store information on the loacl grid (i.e. replaces comgeomphy) and moreover give these variables more obvious names (e.g.: rlond => longitude, rlatd => latitude, airephy => cell_area).
• removed obsolete comgeomphy.h and comgeomphy.F90

EM

Location:

LMDZ5/trunk/libf/dyn3dmem

Files:

• bands.F90 (modified) (4 diffs)
• gcm.F90 (modified) (3 diffs)

LMDZ5/trunk/libf/dyn3dmem/bands.F90

@@ -105 +105 @@
    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
@@ -118 +116 @@
       enddo
           
-#ifdef CPP_PHYS
-      do i=0,MPI_Size-1
+      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
         if (i/=0) then
@@ -139 +147 @@
         endif
       enddo
-#endif      
+
       CALL create_distrib(jj_Nb_Caldyn,distrib_caldyn)
       CALL create_distrib(jj_Nb_vanleer,distrib_vanleer)
@@ -479 +487 @@
   
   
+

LMDZ5/trunk/libf/dyn3dmem/gcm.F90

@@ -10 +10 @@
   USE parallel_lmdz
   USE infotrac
-#ifdef CPP_PHYS
-  USE mod_interface_dyn_phys, ONLY: init_interface_dyn_phys
-#endif
+!#ifdef CPP_PHYS
+!  USE mod_interface_dyn_phys, ONLY: init_interface_dyn_phys
+!#endif
   USE mod_hallo
   USE Bands
@@ -152 +152 @@
   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
 
@@ -397 +397 @@
      ! Physics:
 #ifdef CPP_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)