Changeset 1549 for trunk/LMDZ.COMMON/libf/dyn3d/leapfrog.F

Timestamp:

May 6, 2016, 12:30:29 PM (9 years ago)

Author:

emillour

Message:

All GCMs:
Further adaptations to keep up with changes in LMDZ5 concerning
physics/dynamics separation (up to rev r2420 of LMDZ5)

• all physics packages:
• added module callphysiq_mod.F90 in dynphy_lonlat/phy* which contains the routine "call_physiq" which is called by calfis* and calls the physics. This way different "physiq" routine from different physics packages may be called: The calfis* routines now exposes all available fields that might be transmitted to physiq but which is actually send (ie: expected/needed by physiq) is decided in call_physiq.
• turned "physiq.F[90]" into module "physiq_mod.F[90]" for better control of "physiq" arguments. for phyvenus/phytitan, extracted gr_fi_ecrit from physiq.F as gr_fi_ecrit.F90 (note that it can only work in serial).

• misc:
• updated wxios.F90 to keep up with LMDZ5 modifications.

• dyn3d_common:
• infotrac.F90 keep up with LMDZ5 modifications (cosmetics)

• dyn3d:
• gcm.F90: cosmetic cleanup.
• leapfrog.F90: fix computation of date as function of itau.

• dyn3dpar:
• gcm.F: cosmetic cleanup.
• leapfrog_p.F90: fix computation of date as function of itau.

NB: physics are given the date corresponding to the end of the
physics step.

• dynphy_lonlat:
• calfis.F : added computation of relative wind vorticity.
• calfis_p.F: added computation of relative wind vorticity (input required by Earth physics)

EM

File:

• trunk/LMDZ.COMMON/libf/dyn3d/leapfrog.F (modified) (4 diffs)

trunk/LMDZ.COMMON/libf/dyn3d/leapfrog.F

@@ -298 +298 @@
    1  CONTINUE ! Matsuno Forward step begins here
 
+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) 
       jD_cur = jD_cur + int(jH_cur)
       jH_cur = jH_cur - int(jH_cur)
@@ -349 +352 @@
 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) 
+        jD_cur = jD_cur + int(jH_cur)
+        jH_cur = jH_cur - int(jH_cur)
+      ENDIF
 
 
@@ -516 +528 @@
 
            jD_cur = jD_ref + day_ini - day_ref +                        &
-     &          itau/day_step 
+     &          (itau+1)/day_step 
 
            IF ((planet_type .eq."generic").or.
@@ -525 +537 @@
 
            jH_cur = jH_ref + start_time +                               &
-     &          mod(itau,day_step)/float(day_step) 
+     &          mod(itau+1,day_step)/float(day_step) 
+           IF ((planet_type .eq."generic").or.
+     &         (planet_type .eq."mars")) THEN
+             jH_cur = jH_ref + start_time +                               &
+     &          mod(itau,day_step)/float(day_step)
+           ENDIF
            jD_cur = jD_cur + int(jH_cur)
            jH_cur = jH_cur - int(jH_cur)