Changeset 2408 for LMDZ5/branches/testing/libf/dyn3dmem/leapfrog_loc.F

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/dyn3dmem/leapfrog_loc.F (modified) (2 diffs)

LMDZ5/branches/testing/libf/dyn3dmem/leapfrog_loc.F

@@ -308 +308 @@
 
    1  CONTINUE ! Matsuno Forward step begins here
-      !write(*,*) 'leapfrog 298: itau=',itau
+
+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) 
       if (jH_cur > 1.0 ) then
         jD_cur = jD_cur +1.
@@ -421 +424 @@
 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) 
+        if (jH_cur > 1.0 ) then
+          jD_cur = jD_cur +1.
+          jH_cur = jH_cur -1.
+        endif
+      ENDIF
 
 c   gestion des appels de la physique et des dissipations: