Changeset 2422

Timestamp:

Jan 6, 2016, 12:37:41 PM (9 years ago)

Author:

Ehouarn Millour

Message:

Small modification in the way time and calendar are handled: Now all the time keeping is done in the physics and only the timestep is transfered from the dynamics to the physics. Due to changes in computations and roundoffs this will change reference bench results.
The implementation of this change in phymar is left as future work.
EM

Location:

LMDZ5/trunk/libf

Files:

• dynphy_lonlat/phydev/callphysiq_mod.F90 (modified) (1 diff)
• dynphy_lonlat/phylmd/callphysiq_mod.F90 (modified) (1 diff)
• phydev/physiq_mod.F90 (modified) (2 diffs)
• phylmd/dyn1d/lmdz1d.F90 (modified) (1 diff)
• phylmd/phys_cal_mod.F90 (modified) (2 diffs)
• phylmd/physiq_mod.F90 (modified) (5 diffs)
• phylmd/time_phylmdz_mod.F90 (modified) (1 diff)

LMDZ5/trunk/libf/dynphy_lonlat/phydev/callphysiq_mod.F90

@@ -57 +57 @@
               debut_split,    &
               lafin_split,    &
-              jD_cur,         &
-              jH_cur_split,   &
               zdt_split,      &
               zplev_omp,      &

LMDZ5/trunk/libf/dynphy_lonlat/phylmd/callphysiq_mod.F90

@@ -71 +71 @@
               debut_split,    &
               lafin_split,    &
-              jD_cur,         &
-              jH_cur_split,   &
               zdt_split,      &
               zplev_omp,      &

LMDZ5/trunk/libf/phydev/physiq_mod.F90

@@ -7 +7 @@
 
       SUBROUTINE physiq (nlon,nlev, &
-     &            debut,lafin,jD_cur, jH_cur,pdtphys, &
+     &            debut,lafin,pdtphys, &
      &            paprs,pplay,pphi,pphis,presnivs, &
      &            u,v,t,qx, &
@@ -35 +35 @@
       integer,intent(in) :: nlon ! number of atmospheric colums
       integer,intent(in) :: nlev ! number of vertical levels (should be =klev)
-      real,intent(in) :: jD_cur ! current day number (Julian day)
-      real,intent(in) :: jH_cur ! current time of day (as fraction of day)
       logical,intent(in) :: debut ! signals first call to physics
       logical,intent(in) :: lafin ! signals last call to physics

LMDZ5/trunk/libf/phylmd/dyn1d/lmdz1d.F90

@@ -934 +934 @@
 
        call physiq(ngrid,llm, &
-            firstcall,lastcall, day,time,timestep, &
+            firstcall,lastcall,timestep, &
             plev,play,phi,phis,presnivs, &
             u,v, rot, temp,q,omega2, &

LMDZ5/trunk/libf/phylmd/phys_cal_mod.F90

@@ -52 +52 @@
   END SUBROUTINE  phys_cal_init
 
-  SUBROUTINE phys_cal_update(jD_cur, jH_cur)
+  SUBROUTINE phys_cal_update(julian_date)
     ! This subroutine updates the module saved variables.
 
     USE IOIPSL, only: ju2ymds, ymds2ju, ioget_mon_len, ioget_year_len
-    
-    REAL, INTENT(IN) :: jD_cur ! jour courant a l'appel de la physique (jour julien)
-    REAL, INTENT(IN) :: jH_cur ! heure courante a l'appel de la physique (jour julien)
+    IMPLICIT NONE
+    REAL, INTENT(IN) :: julian_date
+
+    jD_cur=INT(julian_date)
+    jH_cur=julian_date-jD_cur
     
     CALL ju2ymds(jD_cur+jH_cur, year_cur, mth_cur, day_cur, hour)
@@ -68 +70 @@
     days_elapsed = jD_cur - jD_1jan
 
-    ! Get lenght of acutual month
+    ! Get lenght of current month
     mth_len = ioget_mon_len(year_cur,mth_cur)
 
+    ! Get length of current year
     year_len = ioget_year_len(year_cur)
 

LMDZ5/trunk/libf/phylmd/physiq_mod.F90

@@ -10 +10 @@
 
 SUBROUTINE physiq (nlon,nlev, &
-     debut,lafin,jD_cur_,jH_cur_,pdtphys_, &
+     debut,lafin,pdtphys_, &
      paprs,pplay,pphi,pphis,presnivs, &
      u,v,rot,t,qx, &
@@ -20 +20 @@
   USE geometry_mod, ONLY: cell_area, latitude_deg, longitude_deg
   USE phys_cal_mod, only: year_len, mth_len, days_elapsed, jh_1jan, year_cur, &
-       mth_cur,jD_cur, jH_cur, jD_ref, phys_cal_update
+       mth_cur,jD_cur, jH_cur, jD_ref
   USE write_field_phy
   USE dimphy
@@ -29 +29 @@
   USE print_control_mod, ONLY: mydebug=>debug , lunout, prt_level
   USE phystokenc_mod, ONLY: offline, phystokenc
-  USE time_phylmdz_mod, only: raz_date, day_step_phy
+  USE time_phylmdz_mod, only: raz_date, day_step_phy, update_time
   USE vampir
   USE pbl_surface_mod, ONLY : pbl_surface
@@ -226 +226 @@
   INTEGER nlon
   INTEGER nlev
-  REAL, intent(in):: jD_cur_, jH_cur_ 
-! JD_cur and JH_cur to be used in physics are in phys_cal_mod
   REAL,INTENT(IN) :: pdtphys_
 ! NB: pdtphys to be used in physics is in time_phylmdz_mod
@@ -915 +913 @@
   ! Gestion calendrier : mise a jour du module phys_cal_mod
   !
-  JD_cur=JD_cur_
-  JH_cur=JH_cur_
   pdtphys=pdtphys_
-  CALL phys_cal_update(jD_cur,jH_cur)
+  CALL update_time(pdtphys)
 
   !======================================================================

LMDZ5/trunk/libf/phylmd/time_phylmdz_mod.F90

@@ -77 +77 @@
   END SUBROUTINE init_iteration
 
+  SUBROUTINE update_time(pdtphys_)
+  ! This subroutine updates the module saved variables.
+  USE ioipsl, ONLY : ymds2ju
+  USE phys_cal_mod, ONLY: phys_cal_update
+  USE print_control_mod, ONLY: lunout
+  IMPLICIT NONE
+    REAL,INTENT(IN) :: pdtphys_
+    REAL            :: julian_date
+    
+    ! Check if the physics timestep has changed
+    IF ( ABS( (pdtphys-pdtphys_) / ((pdtphys+pdtphys_)/2))> 10.*EPSILON(pdtphys_)) THEN
+       WRITE(lunout,*) "WARNING ! Physics time step changes from a call to the next",pdtphys_,pdtphys
+       WRITE(lunout,*) "Not sure the physics parametrizations can handle this..."
+    ENDIF
+    pdtphys=pdtphys_
+    
+    ! Update elapsed time since begining of run:
+    current_time=current_time+pdtphys
+
+    ! Compute corresponding Julian date and update calendar
+    CALL ymds2ju(annee_ref,1,day_ini,start_time+current_time,julian_date)
+    CALL phys_cal_update(julian_date)
+    
+  END SUBROUTINE update_time
+
 END MODULE time_phylmdz_mod