Changeset 2408 for LMDZ5/branches/testing/libf/dyn3d

Timestamp:

Dec 14, 2015, 11:43:09 AM (9 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r2298:2396 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/dyn3d/dynetat0.F (deleted)
• libf/dyn3d/dynetat0.f90 (copied) (copied from LMDZ5/trunk/libf/dyn3d/dynetat0.f90)
• libf/dyn3d/dynredem.F (deleted)
• libf/dyn3d/dynredem.F90 (copied) (copied from LMDZ5/trunk/libf/dyn3d/dynredem.F90)
• libf/dyn3d/dynredem_mod.F90 (copied) (copied from LMDZ5/trunk/libf/dyn3d/dynredem_mod.F90)
• libf/dyn3d/gcm.F90 (modified) (7 diffs)
• libf/dyn3d/leapfrog.F (modified) (5 diffs)

LMDZ5/branches/testing/libf/dyn3d/gcm.F90

@@ -22 +22 @@
   USE infotrac
   USE control_mod
-
-#ifdef INCA
-  ! Only INCA needs these informations (from the Earth's physics)
-  USE indice_sol_mod
-  USE mod_phys_lmdz_para, ONLY : klon_mpi_para_nb
-#endif
+  USE mod_const_mpi, ONLY: COMM_LMDZ
+
 
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -34 +30 @@
   ! dynamique -> physique pour l'initialisation
 #ifdef CPP_PHYS
-  !      USE dimphy
-  !      USE comgeomphy
+  USE iniphysiq_mod, ONLY: iniphysiq
 #endif
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -86 +81 @@
   include "iniprint.h"
   include "tracstoke.h"
-#ifdef INCA
-  ! Only INCA needs these informations (from the Earth's physics)
-  !include "indicesol.h"
-#endif
 
   REAL zdtvr
@@ -182 +173 @@
   ! A nettoyer. On ne veut qu'une ou deux routines d'interface 
   ! dynamique -> physique pour l'initialisation
-#ifdef CPP_PHYS
-  CALL Init_Phys_lmdz(iim,jjp1,llm,1,(/(jjm-1)*iim+2/))
-  !      call InitComgeomphy ! now done in iniphysiq
-#endif
+!#ifdef CPP_PHYS
+!  CALL Init_Phys_lmdz(iim,jjp1,llm,1,(/(jjm-1)*iim+2/))
+!  !      call InitComgeomphy ! now done in iniphysiq
+!#endif
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
   !-----------------------------------------------------------------------
@@ -209 +200 @@
 #endif
   !-----------------------------------------------------------------------
-
-  IF (type_trac == 'inca') THEN
-#ifdef INCA
-     call init_const_lmdz(nbtr,anneeref,dayref,iphysiq,day_step,nday,  &
-          nbsrf, is_oce,is_sic,is_ter,is_lic)
-     call init_inca_para(iim,jjm+1,klon,1,klon_mpi_para_nb,0)
-#endif
-  END IF
   !
   !
@@ -260 +243 @@
 
   endif ! of if (read_start)
-
-  IF (type_trac == 'inca') THEN
-#ifdef INCA
-     call init_inca_dim(klon,llm,iim,jjm, &
-          rlonu,rlatu,rlonv,rlatv)
-#endif
-  END IF
 
 
@@ -416 +392 @@
      ! Physics:
 #ifdef CPP_PHYS
-     CALL iniphysiq(iim,jjm,llm,daysec,day_ini,dtphys/nsplit_phys, &
-          rlatu,rlonv,aire,cu,cv,rad,g,r,cpp, &
+     CALL iniphysiq(iim,jjm,llm, &
+          (jjm-1)*iim+2,comm_lmdz, &
+          daysec,day_ini,dtphys/nsplit_phys, &
+          rlatu,rlatv,rlonu,rlonv,aire,cu,cv,rad,g,r,cpp, &
           iflag_phys)
 #endif

LMDZ5/branches/testing/libf/dyn3d/leapfrog.F

@@ -228 +228 @@
    1  CONTINUE ! Matsuno Forward step begins here
 
+c   date: (NB: date remains unchanged for Backward step)
+c   -----
+
       jD_cur = jD_ref + day_ini - day_ref +                             &
-     &          itau/day_step
+     &          (itau+1)/day_step
       jH_cur = jH_ref + start_time +                                    &
-     &          mod(itau,day_step)/float(day_step) 
+     &          mod(itau+1,day_step)/float(day_step) 
       jD_cur = jD_cur + int(jH_cur)
       jH_cur = jH_cur - int(jH_cur)
@@ -277 +280 @@
 c-----------------------------------------------------------------------
 
-c   date:
+c   date: (NB: only leapfrog step requires recomputing date)
 c   -----
+
+      IF (leapf) THEN
+        jD_cur = jD_ref + day_ini - day_ref +
+     &            (itau+1)/day_step
+        jH_cur = jH_ref + start_time +
+     &            mod(itau+1,day_step)/float(day_step) 
+        jD_cur = jD_cur + int(jH_cur)
+        jH_cur = jH_cur - int(jH_cur)
+      ENDIF
 
 
@@ -416 +428 @@
 !     &              (itau * dtvr / daysec - int(itau * dtvr / daysec)) 
            jD_cur = jD_ref + day_ini - day_ref +                        &
-     &          itau/day_step
+     &          (itau+1)/day_step
 
            IF (planet_type .eq."generic") THEN
@@ -424 +436 @@
 
            jH_cur = jH_ref + start_time +                               &
-     &              mod(itau,day_step)/float(day_step) 
+     &              mod(itau+1,day_step)/float(day_step) 
            jD_cur = jD_cur + int(jH_cur)
            jH_cur = jH_cur - int(jH_cur)
@@ -443 +455 @@
          IF (ip_ebil_dyn.ge.1 ) THEN 
           ztit='bil dyn'
-! Ehouarn: be careful, diagedyn is Earth-specific (includes ../phylmd/..)!
+! Ehouarn: be careful, diagedyn is Earth-specific!
            IF (planet_type.eq."earth") THEN
-#ifdef CPP_EARTH
             CALL diagedyn(ztit,2,1,1,dtphys
      &    , ucov    , vcov , ps, p ,pk , teta , q(:,:,1), q(:,:,2))
-#endif
            ENDIF
          ENDIF ! of IF (ip_ebil_dyn.ge.1 )