Changeset 4173

Timestamp:

Jun 17, 2022, 6:49:40 PM (2 years ago)

Author:

lguez

Message:

Sync latest trunk changes to branch LMDZ-ECRAD.

Location:

LMDZ6/branches/LMDZ-ECRAD

Files:

• . (modified) (1 prop)
• libf/dyn3d_common/infotrac.F90 (modified) (1 diff)
• libf/dyn3dmem/dynredem_loc.F90 (modified) (6 diffs)
• libf/dyn3dmem/leapfrog_loc.F (modified) (4 diffs)
• libf/phy_common/physics_distribution_mod.F90 (modified) (2 diffs)
• libf/phylmd/infotrac_phy.F90 (modified) (1 diff)

LMDZ6/branches/LMDZ-ECRAD/libf/dyn3d_common/infotrac.F90

@@ -288 +288 @@
       nbtr   = nqtrue-COUNT(delPhase(tracers(:)%gen0Name) == 'H2O' &
                                .AND. tracers(:)%component == 'lmdz') !--- Number of tracers passed to phytrac
+#ifdef INCA
+      nqINCA = COUNT(tracers(:)%component == 'inca')
+#endif
       lerr = getKey('hadv', hadv, ky=tracers(:)%keys)
       lerr = getKey('vadv', vadv, ky=tracers(:)%keys)

LMDZ6/branches/LMDZ-ECRAD/libf/dyn3dmem/dynredem_loc.F90

@@ -15 +15 @@
                     NF90_64BIT_OFFSET
   USE dynredem_mod, ONLY: cre_var, put_var, err, modname, fil
-  USE comvert_mod, ONLY: ap,bp,aps,bps,presnivs,pseudoalt,pa,preff, &
-                         nivsig,nivsigs
+  USE comvert_mod,  ONLY: ap, bp, presnivs, pa, preff, nivsig, nivsigs,&
+                          aps,bps,pseudoalt
   USE comconst_mod, ONLY: cpp, daysec, dtvr, g, kappa, omeg, rad
   USE logic_mod, ONLY: fxyhypb, ysinus
@@ -37 +37 @@
 !===============================================================================
 ! Local variables:
-  INTEGER :: iq, l
+  INTEGER :: iq
   INTEGER, PARAMETER :: length=100
   REAL    :: tab_cntrl(length)                     !--- RUN PARAMETERS TABLE
@@ -45 +45 @@
   INTEGER :: indexID
   INTEGER :: rlonuID, rlonvID, rlatuID, rlatvID
-  INTEGER :: sID, sigID, nID, vID, timID
+  INTEGER :: sID, sigID, nID, timID
   INTEGER :: yyears0, jjour0, mmois0
-  REAL    :: zan0, zjulian, hours
+  REAL    :: zjulian, hours
 !===============================================================================
   modname='dynredem0'; fil=fichnom
@@ -145 +145 @@
 
 !--- Define fields saved later
-  WRITE(unites,"('days since ',i4,'-',i2.2,'-',i2.2,' 00:00:00')"),&
+  WRITE(unites,"('days since ',i4,'-',i2.2,'-',i2.2,' 00:00:00')") &
                yyears0,mmois0,jjour0
   CALL cre_var(nid,"temps","Temps de simulation",[timID],unites)
@@ -202 +202 @@
 !===============================================================================
 ! Local variables:
-  INTEGER :: l, iq, nid, vID, ierr, nid_trac, vID_trac
+  INTEGER :: iq, nid, vID, ierr, nid_trac, vID_trac
   INTEGER, SAVE :: nb=0
   INTEGER, PARAMETER :: length=100
@@ -213 +213 @@
   IF(mpi_rank==0) THEN !++++++++++++++++++++++++++++++++++++++++++++++++++++++++
   modname='dynredem1_loc'; fil=fichnom
-  fil=fichnom
   CALL err(NF90_OPEN(fil,NF90_WRITE,nid),"open",fil)
 

LMDZ6/branches/LMDZ-ECRAD/libf/dyn3dmem/leapfrog_loc.F

@@ -1519 +1519 @@
 
 #ifdef INCA
-         if (ANY(types_trac == 'inca') .OR. ANY(types_trac == 'inco')) then 
-            call finalize_inca
-         endif
+         if (ANY(types_trac == 'inca') .OR. &
+     &       ANY(types_trac == 'inco')) CALL finalize_inca
 #endif
 #ifdef REPROBUS
-         if (ANY(types_trac == 'repr')) then
-         call finalize_reprobus
-         endif
+         if (ANY(types_trac == 'repr')) CALL finalize_reprobus
 #endif
 
@@ -1572 +1569 @@
 
 #ifdef INCA
-              if (ANY(types_trac == 'inca') .OR. ANY(types_trac == 'inco')) then 
-                 call finalize_inca
-              endif
+              if (ANY(types_trac == 'inca') .OR. &
+     &            ANY(types_trac == 'inco')) CALL finalize_inca
 #endif
 #ifdef REPROBUS
-              if (ANY(types_trac == 'repr')) then
-         call finalize_reprobus
-              endif
+              if (ANY(types_trac == 'repr')) CALL finalize_reprobus
 #endif
 
@@ -1743 +1737 @@
 
 #ifdef INCA
-                 if (ANY(types_trac == 'inca') .OR. ANY(types_trac == 'inco')) then 
-                    call finalize_inca
-                 endif
+                 if (ANY(types_trac == 'inca') .OR. &
+     &               ANY(types_trac == 'inco')) CALL finalize_inca
 #endif
 #ifdef REPROBUS
-                 if (ANY(types_trac == 'repr')) then
-         call finalize_reprobus
-                 endif
+                 if (ANY(types_trac == 'repr')) CALL finalize_reprobus
 #endif
 
@@ -1854 +1845 @@
 
 #ifdef INCA
-      if (ANY(types_trac == 'inca') .OR. ANY(types_trac == 'inco')) then 
-         call finalize_inca
-      endif
+      if (ANY(types_trac == 'inca') .OR. &
+     &    ANY(types_trac == 'inco')) CALL finalize_inca
 #endif
 #ifdef REPROBUS
-      if (ANY(types_trac == 'repr')) then
-         call finalize_reprobus
-      endif
+      if (ANY(types_trac == 'repr')) CALL finalize_reprobus
 #endif
 

LMDZ6/branches/LMDZ-ECRAD/libf/phy_common/physics_distribution_mod.F90

@@ -37 +37 @@
 #endif
 
+#ifdef REPROBUS
 ! Initialization of Reprobus
-    IF (ANY(types_trac == 'repr')) THEN
-#ifdef REPROBUS
-       CALL Init_chem_rep_phys(klon_omp,nbp_lev)
+    IF (ANY(types_trac == 'repr')) CALL Init_chem_rep_phys(klon_omp,nbp_lev)
+    END IF
 #endif
-    END IF
 
 !$OMP END PARALLEL
@@ -71 +70 @@
 !    CALL Init_dimphy(klon_omp,nbp_lev)
 !
+!#ifdef REPROBUS
 !! Initialization of Reprobus
-!    IF (ANY(types_trac == 'repr')) THEN
-!#ifdef REPROBUS
-!       CALL Init_chem_rep_phys(klon_omp,nbp_lev)
+!    IF (ANY(types_trac == 'repr')) CALL Init_chem_rep_phys(klon_omp,nbp_lev)
+!    END IF
 !#endif
-!    END IF
 !
 !!$OMP END PARALLEL

LMDZ6/branches/LMDZ-ECRAD/libf/phylmd/infotrac_phy.F90

@@ -106 +106 @@
    CHARACTER(LEN=maxlen),   SAVE :: type_trac                   !--- Keyword for tracers type
    CHARACTER(LEN=maxlen),   SAVE, ALLOCATABLE :: types_trac(:)  !--- Keyword for tracers type
-
 !$OMP THREADPRIVATE(nqtot, nbtr, nqo, nbIso, nqtottr, nqCO2, type_trac, types_trac)