Changeset 2507 for trunk/LMDZ.MARS/libf/phymars

Timestamp:

Apr 28, 2021, 1:00:13 PM (4 years ago)

Author:

romain.vande

Message:

For LMDZ MARS: Update of day_ini, time and hour_ini in restart and retstartfi.
Hour_ini is obsolete. If we write one restart file: day_ini is the last day
of the simulation and the remaining time is in Time (often=0), if we write
multiple restart nothing changes

File:

• trunk/LMDZ.MARS/libf/phymars/physiq_mod.F (modified) (6 diffs)

trunk/LMDZ.MARS/libf/phymars/physiq_mod.F

@@ -87 +87 @@
       USE mod_phys_lmdz_omp_data, ONLY: is_omp_master
 #endif
+      USE temps_mod, ONLY: day_end
 
 #ifdef CPP_XIOS      
@@ -518 +519 @@
 c  1.1   Initialisation only at first call
 c  ---------------------------------------
+
       IF (firstcall) THEN
 
@@ -688 +690 @@
            if (callslope) call getslopes(ngrid,phisfi)
            ! no need to create a restart file in 1d
-           call physdem0("restartfi.nc",longitude,latitude,
+         if (ecritstart.GT.0) then
+             call physdem0("restartfi.nc",longitude,latitude,
      &                   nsoilmx,ngrid,nlayer,nq,
      &                   ptimestep,pday,time_phys,cell_area,
      &                   albedodat,inertiedat,zmea,zstd,zsig,zgam,zthe,
      &                   hmons,summit,base)
+          else
+             call physdem0("restartfi.nc",longitude,latitude,
+     &                   nsoilmx,ngrid,nlayer,nq,
+     &                   ptimestep,float(day_end),time_phys,cell_area,
+     &                   albedodat,inertiedat,zmea,zstd,zsig,zgam,zthe,
+     &                   hmons,summit,base)
+          endif
          endif
 
@@ -2294 +2304 @@
      .    .or. lastcall  ) THEN
          
-          ztime_fin = pday + ptime  + ptimestep/(float(iphysiq)*daysec)
-     .               - day_ini - time_phys
-          IF (grid_type==unstructured) THEN
+          IF (grid_type==unstructured) THEN !IF DYNAMICO
+
              ! When running Dynamico, no need to add a dynamics time step to ztime_fin
              IF (ptime.LE. 1.E-10) THEN 
@@ -2306 +2315 @@
      .                  - day_ini - time_phys
              ENDIF
+
+          ELSE ! IF LMDZ
+
+          if (ecritstart.GT.0) then !IF MULTIPLE RESTARTS nothing change
+          ztime_fin = pday + ptime  + ptimestep/(float(iphysiq)*daysec)
+     .               - day_ini - time_phys
+          else !IF ONE RESTART final time in top of day_end
+          ztime_fin = pday + ptime  + ptimestep/(float(iphysiq)*daysec)
+     .               - day_ini - time_phys-(day_end-day_ini)
+          endif
+
           ENDIF
           write(*,'(A,I7,A,F12.5)') 
@@ -2311 +2331 @@
      .          icount,' date=',ztime_fin
             
-
           call physdem1("restartfi.nc",nsoilmx,ngrid,nlayer,nq,
      .                ptimestep,ztime_fin,