Changeset 1626

Timestamp:

May 15, 2012, 10:37:02 AM (12 years ago)

Author:

Laurent Fairhead

Message:

Modifications nécessaires sur les dates pour avoir 1+1=2 avec l'ancienne physique

---

Necessary modifications to ensure 1+1=2 with the old physics package

Location:

LMDZ5/trunk/libf

Files:

• dyn3d/leapfrog.F (modified) (2 diffs)
• dyn3dpar/leapfrog_p.F (modified) (2 diffs)

LMDZ5/trunk/libf/dyn3d/leapfrog.F

@@ -225 +225 @@
 
       jD_cur = jD_ref + day_ini - day_ref +                             &
-     &          int (itau * dtvr / daysec) 
+     &          itau/day_step
       jH_cur = jH_ref + start_time +                                    &
-     &          (itau * dtvr / daysec - int(itau * dtvr / daysec)) 
+     &          mod(itau,day_step)/float(day_step) 
       jD_cur = jD_cur + int(jH_cur)
       jH_cur = jH_cur - int(jH_cur)
@@ -382 +382 @@
 !     &              (itau * dtvr / daysec - int(itau * dtvr / daysec)) 
            jD_cur = jD_ref + day_ini - day_ref +                        &
-     &          int (itau * dtvr / daysec) 
+     &          itau/day_step
            jH_cur = jH_ref + start_time +                               &
-     &          (itau * dtvr / daysec - int(itau * dtvr / daysec)) 
+     &              mod(itau,day_step)/float(day_step) 
            jD_cur = jD_cur + int(jH_cur)
            jH_cur = jH_cur - int(jH_cur)

LMDZ5/trunk/libf/dyn3dpar/leapfrog_p.F

@@ -247 +247 @@
 
       jD_cur = jD_ref + day_ini - day_ref +                             &
-     &          int (itau * dtvr / daysec) 
+     &          itau/day_step
       jH_cur = jH_ref + start_time +                                    &
-     &          (itau * dtvr / daysec - int(itau * dtvr / daysec)) 
+     &         mod(itau,day_step)/float(day_step) 
       if (jH_cur > 1.0 ) then
         jD_cur = jD_cur +1.
@@ -706 +706 @@
 c$OMP BARRIER
            jD_cur = jD_ref + day_ini - day_ref
-     $        + int (itau * dtvr / daysec) 
+     $        + itau/day_step
            jH_cur = jH_ref + start_time +                                &
-     &              (itau * dtvr / daysec - int(itau * dtvr / daysec)) 
+     &              mod(itau,day_step)/float(day_step) 
 !         call ju2ymds(jD_cur+jH_cur, an, mois, jour, secondes)
            if (jH_cur > 1.0 ) then