Changeset 4013 for LMDZ6/branches/Ocean_skin/libf/dyn3dmem/leapfrog_loc.F

Timestamp:

Nov 19, 2021, 4:58:59 PM (3 years ago)

Author:

lguez

Message:

Sync latest trunk changes to Ocean_skin

Location:

LMDZ6/branches/Ocean_skin

Files:

• . (modified) (1 prop)
• libf/dyn3dmem/leapfrog_loc.F (modified) (6 diffs)

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

@@ -1538 +1538 @@
 c$OMP END MASTER
 
+         if (ok_guide) then
+           ! set ok_guide to false to avoid extra output
+           ! in following forward step
+           ok_guide=.false.
+         endif
+
 #ifdef INCA
-         if (type_trac == 'inca') then 
+         if (type_trac == 'inca' .OR. type_trac == 'inco') then 
             call finalize_inca
          endif
@@ -1594 +1600 @@
 
 #ifdef INCA
-              if (type_trac == 'inca') then 
+              if (type_trac == 'inca' .OR. type_trac == 'inco') then 
                  call finalize_inca
               endif
@@ -1681 +1687 @@
      &                           vcov,ucov,teta,q,masse,ps)
 !              endif ! of if (planet_type.eq."earth")
+                if (ok_guide) then
+                  ! set ok_guide to false to avoid extra output
+                  ! in following forward step
+                  ok_guide=.false.
+                endif
 
 !              CLOSE(99)
@@ -1750 +1761 @@
 
 #ifdef INCA
-                 if (type_trac == 'inca') then 
+                 if (type_trac == 'inca' .OR. type_trac == 'inco') then 
                     call finalize_inca
                  endif
@@ -1827 +1838 @@
      .                               vcov,ucov,teta,q,masse,ps)
 !               endif ! of if (planet_type.eq."earth")
+                if (ok_guide) then
+                  ! set ok_guide to false to avoid extra output
+                  ! in following forward step
+                  ok_guide=.false.
+                endif
+
               ENDIF ! of IF(itau.EQ.itaufin)
 
@@ -1845 +1862 @@
 
 #ifdef INCA
-      if (type_trac == 'inca') then 
+      if (type_trac == 'inca' .OR. type_trac == 'inco') then 
          call finalize_inca
       endif