Changeset 3947 for LMDZ6/trunk/libf

Timestamp:

Jun 21, 2021, 5:15:02 PM (3 years ago)

Author:

Ehouarn Millour

Message:

Nudging: fix the problem of having one extra step in the output guide_ins.nc file. This is done by reseting ok_guide to .false. once the restart file is generated, and thus in the ultimate forward Matsuno step that is done afterwards, nudging is not called.
EM

Location:

LMDZ6/trunk/libf

Files:

• dyn3d/leapfrog.F (modified) (2 diffs)
• dyn3dmem/leapfrog_loc.F (modified) (3 diffs)

LMDZ6/trunk/libf/dyn3d/leapfrog.F

@@ -748 +748 @@
 
               CLOSE(99)
+              if (ok_guide) then
+                ! set ok_guide to false to avoid extra output
+                ! in following forward step
+                ok_guide=.false.
+              endif
               !!! Ehouarn: Why not stop here and now?
             ENDIF ! of IF (itau.EQ.itaufin)
@@ -868 +873 @@
      &                           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)
 

LMDZ6/trunk/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' .OR. type_trac == 'inco') then 
@@ -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)
@@ -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)