Changeset 2258 for LMDZ5/branches/testing/libf/dyn3dmem/gcm.F

Timestamp:

Apr 13, 2015, 10:21:09 AM (10 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes 2216:2237 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/dyn3dmem/gcm.F (modified) (12 diffs)

LMDZ5/branches/testing/libf/dyn3dmem/gcm.F

@@ -1 +1 @@
 !
-! $Id$
+! $Id: $
 !
 c
@@ -23 +23 @@
 ! 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
@@ -83 +83 @@
 #endif
 
-      INTEGER         longcles
-      PARAMETER     ( longcles = 20 )
-      REAL  clesphy0( longcles )
-      SAVE  clesphy0
-
-
-
       REAL zdtvr
 
@@ -111 +104 @@
 
       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
@@ -142 +128 @@
 
 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   ----------------
@@ -171 +144 @@
 c  ---------------------------------------
 c
-! Ehouarn: dump possibility of using defrun
-!#ifdef CPP_IOIPSL
-      CALL conf_gcm( 99, .TRUE. , clesphy0 )
+      CALL conf_gcm( 99, .TRUE. )
       if (mod(iphysiq, iperiod) /= 0) call abort_gcm("conf_gcm",
      s "iphysiq must be a multiple of iperiod", 1)
-!#else
-!      CALL defrun( 99, .TRUE. , clesphy0 )
-!#endif
 c
 c
@@ -192 +160 @@
 #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 Set_Distrib(distrib_caldyn)
@@ -206 +175 @@
 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
 
 c-----------------------------------------------------------------------
@@ -225 +194 @@
         call ioconf_calendar('noleap')
         write(lunout,*)'CALENDRIER CHOISI: Terrestre a 365 jours/an'
-      else if (calend == 'earth_366d') then
+      else if (calend == 'gregorian') then
         call ioconf_calendar('gregorian')
         write(lunout,*)'CALENDRIER CHOISI: Terrestre bissextile'
@@ -321 +290 @@
 
 C
-C on remet le calendrier à zero si demande
+C on remet le calendrier \`a zero si demande
 c
       IF (start_time /= starttime) then
         WRITE(lunout,*)' GCM: Attention l''heure de depart lue dans le'
-     &,' fichier restart ne correspond pas à celle lue dans le run.def'
+     &,' fichier restart ne correspond pas a celle lue dans le run.def'
         IF (raz_date == 1) then
           WRITE(lunout,*)'Je prends l''heure lue dans run.def'
@@ -431 +400 @@
 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)
-
-         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, 
-     &                iflag_phys) 
-#endif
-         call_iniphys=.false.
-      ENDIF ! of IF (call_iniphys.and.(iflag_phys==1.or.iflag_phys>=100))
+         CALL iniphysiq(iim,jjm,llm,daysec,day_ini,dtphys/nsplit_phys,
+     &                rlatu,rlonv,aire,cu,cv,rad,g,r,cpp,
+     &                iflag_phys)
+#endif
+      ENDIF ! of IF ((iflag_phys==1).or.(iflag_phys>=100))
 
 
@@ -547 +495 @@
 
 c$OMP PARALLEL DEFAULT(SHARED) COPYIN(/temps/,/logici/,/logicl/)
-      CALL leapfrog_loc(ucov,vcov,teta,ps,masse,phis,q,clesphy0,
-     .              time_0)
+      CALL leapfrog_loc(ucov,vcov,teta,ps,masse,phis,q,time_0)
 c$OMP END PARALLEL