Changeset 2225 for LMDZ5/trunk/libf/dyn3dpar

Timestamp:

Mar 11, 2015, 3:55:23 PM (10 years ago)

Author:

Ehouarn Millour

Message:

Some cleanup and tidying up in the dynamics/physics interface.
EM

File:

• LMDZ5/trunk/libf/dyn3dpar/gcm.F (modified) (6 diffs)

LMDZ5/trunk/libf/dyn3dpar/gcm.F

@@ -24 +24 @@
 ! Only INCA needs these informations (from the Earth's physics)
       USE indice_sol_mod
+      USE mod_phys_lmdz_omp_data, ONLY: klon_omp 
 #endif
 
 #ifdef CPP_PHYS
-      USE mod_grid_phy_lmdz
-      USE mod_phys_lmdz_para, ONLY : klon_mpi_para_nb
-      USE mod_phys_lmdz_omp_data, ONLY: klon_omp 
-      USE dimphy
-      USE comgeomphy
+!      USE mod_grid_phy_lmdz
+!      USE mod_phys_lmdz_para, ONLY : klon_mpi_para_nb
+!      USE dimphy
+!      USE comgeomphy
 #endif
       IMPLICIT NONE
@@ -105 +105 @@
 
       LOGICAL lafin
-c      INTEGER ij,iq,l,i,j
-      INTEGER i,j
-
 
       real time_step, t_wrt, t_ops
 
-
-      LOGICAL call_iniphys
-      data call_iniphys/.true./
 
 c+jld variables test conservation energie
@@ -136 +130 @@
 
 c-----------------------------------------------------------------------
-c    variables pour l'initialisation de la physique :
-c    ------------------------------------------------
-      INTEGER ngridmx
-      PARAMETER( ngridmx = 2+(jjm-1)*iim - 1/jjm   )
-      REAL zcufi(ngridmx),zcvfi(ngridmx)
-      REAL latfi(ngridmx),lonfi(ngridmx)
-      REAL airefi(ngridmx)
-      SAVE latfi, lonfi, airefi
-      
-      INTEGER :: ierr
-
-
-c-----------------------------------------------------------------------
 c   Initialisations:
 c   ----------------
@@ -181 +162 @@
 #ifdef CPP_PHYS
         CALL Init_Phys_lmdz(iim,jjp1,llm,mpi_size,distrib_phys)
-#endif
+!#endif
+!      CALL set_bands
+!#ifdef CPP_PHYS
+      CALL Init_interface_dyn_phys
+#endif
+      CALL barrier
+
       CALL set_bands
-#ifdef CPP_PHYS
-      CALL Init_interface_dyn_phys
-#endif
-      CALL barrier
-
       if (mpi_rank==0) call WriteBands
       call SetDistrib(jj_Nb_Caldyn)
@@ -195 +177 @@
 c$OMP END PARALLEL
 
-#ifdef CPP_PHYS
-c$OMP PARALLEL
-      call InitComgeomphy
-c$OMP END PARALLEL 
-#endif
+!#ifdef CPP_PHYS
+!c$OMP PARALLEL
+!      call InitComgeomphy ! now done in iniphysiq
+!c$OMP END PARALLEL 
+!#endif
 
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -419 +401 @@
 c   Initialisation de la physique :
 c   -------------------------------
-      IF (call_iniphys.and.(iflag_phys==1.or.iflag_phys>=100)) THEN
-         latfi(1)=rlatu(1)
-         lonfi(1)=0.
-         zcufi(1) = cu(1)
-         zcvfi(1) = cv(1)
-         DO j=2,jjm
-            DO i=1,iim
-               latfi((j-2)*iim+1+i)= rlatu(j)
-               lonfi((j-2)*iim+1+i)= rlonv(i)
-               zcufi((j-2)*iim+1+i) = cu((j-1)*iip1+i)
-               zcvfi((j-2)*iim+1+i) = cv((j-1)*iip1+i)
-            ENDDO
-         ENDDO
-         latfi(ngridmx)= rlatu(jjp1)
-         lonfi(ngridmx)= 0.
-         zcufi(ngridmx) = cu(ip1jm+1)
-         zcvfi(ngridmx) = cv(ip1jm-iim)
-         CALL gr_dyn_fi(1,iip1,jjp1,ngridmx,aire,airefi)
-         ! Poles are single points on physics grid
-         airefi(1)=sum(aire(1:iim))
-         airefi(ngridmx)=sum(aire(ip1jmp1-(iim+1)+1:ip1jmp1-1))
-!         WRITE(lunout,*)
-!     .       'GCM: WARNING!!! vitesse verticale nulle dans la physique'
+      IF ((iflag_phys==1).or.(iflag_phys>=100)) THEN
 ! Physics:
 #ifdef CPP_PHYS
-         CALL iniphysiq(ngridmx,llm,daysec,day_ini,dtphys/nsplit_phys,
-     &                latfi,lonfi,airefi,zcufi,zcvfi,rad,g,r,cpp,
+         CALL iniphysiq(iim,jjm,llm,daysec,day_ini,dtphys/nsplit_phys,
+     &                rlatu,rlonv,aire,cu,cv,rad,g,r,cpp,
      &                iflag_phys)
 #endif
-         call_iniphys=.false.
-      ENDIF ! of IF (call_iniphys.and.(iflag_phys==1.or.iflag_phys>=100))
+      ENDIF ! of IF ((iflag_phys==1).or.(iflag_phys>=100))