Changeset 3798 for LMDZ6/branches/Ocean_skin/libf/dyn3dmem

Timestamp:

Jan 11, 2021, 11:24:08 PM (4 years ago)

Author:

lguez

Message:

Sync latest trunk changes to Ocean_skin

Location:

LMDZ6/branches/Ocean_skin

Files:

• . (modified) (1 prop)
• libf/dyn3dmem/guide_loc_mod.F90 (modified) (3 diffs)
• libf/dyn3dmem/leapfrog_loc.F (modified) (4 diffs)

LMDZ6/branches/Ocean_skin/libf/dyn3dmem/guide_loc_mod.F90

@@ -27 +27 @@
   LOGICAL, PRIVATE, SAVE  :: invert_p,invert_y,ini_anal
   LOGICAL, PRIVATE, SAVE  :: guide_2D,guide_sav,guide_modele
+!FC
+  LOGICAL, PRIVATE, SAVE  :: convert_Pa
   
   REAL, PRIVATE, SAVE     :: tau_min_u,tau_max_u
@@ -152 +154 @@
         guide_plevs=1
     ENDIF
+!FC
+    CALL getpar('convert_Pa',.true.,convert_Pa,'Convert Pressure levels in Pa')
     ! Fin raccord
     CALL getpar('ini_anal',.false.,ini_anal,'Etat initial = analyse')
@@ -1695 +1699 @@
              status=NF_GET_VARA_REAL(ncidpl,varidpl,1,nlevnc,apnc)
 #endif
-             apnc=apnc*100.! conversion en Pascals
+!FC Pour les corrections la pression est deja en Pascals on commente la ligne ci-dessous
+             IF(convert_Pa) apnc=apnc*100.! conversion en Pascals
              bpnc(:)=0.
          ENDIF

LMDZ6/branches/Ocean_skin/libf/dyn3dmem/leapfrog_loc.F

@@ -1543 +1543 @@
          endif
 #endif
+#ifdef REPROBUS
+         if (type_trac == 'repr') then
+         call finalize_reprobus
+         endif
+#endif
 
 c$OMP MASTER
@@ -1593 +1598 @@
               endif
 #endif
+#ifdef REPROBUS
+              if (type_trac == 'repr') then
+         call finalize_reprobus
+              endif
+#endif
 
 c$OMP MASTER
@@ -1742 +1752 @@
                  if (type_trac == 'inca') then 
                     call finalize_inca
+                 endif
+#endif
+#ifdef REPROBUS
+                 if (type_trac == 'repr') then
+         call finalize_reprobus
                  endif
 #endif
@@ -1834 +1849 @@
       endif
 #endif
+#ifdef REPROBUS
+      if (type_trac == 'repr') then
+         call finalize_reprobus
+      endif
+#endif
 
 c$OMP MASTER