Changeset 2544

Timestamp:

Jul 8, 2021, 3:54:30 PM (4 years ago)

Author:

romain.vande

Message:

MARS GCM:

update of r2507: correction for time output in the case of multiple restart files
RV

Location:

trunk

Files:

• LMDZ.COMMON/libf/dyn3d/leapfrog.F (modified) (1 diff)
• LMDZ.COMMON/libf/dyn3dpar/leapfrog_p.F (modified) (1 diff)
• LMDZ.MARS/README (modified) (2 diffs)
• LMDZ.MARS/libf/phymars/physiq_mod.F (modified) (10 diffs)

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

@@ -909 +909 @@
                 if(ecritstart.GT.0) then
                  CALL dynredem1("restart.nc",
-     &                        REAL(itau)/REAL(day_step),
+     &                        REAL(itau)/REAL(day_step)+
+     &                        time_0-floor(time_0),
      &                        vcov,ucov,teta,q,masse,ps)
                 else
                  CALL dynredem1("restart.nc",
-     &             REAL(itau)/REAL(day_step)-(day_end-day_ini),
+     &             REAL(itau)/REAL(day_step)-(day_end-day_ini)
+     &                        +time_0-floor(time_0),
      &                        vcov,ucov,teta,q,masse,ps)
                 endif

trunk/LMDZ.COMMON/libf/dyn3dpar/leapfrog_p.F

@@ -1817 +1817 @@
                 if(ecritstart.GT.0) then
                  CALL dynredem1_p("restart.nc",
-     &                        REAL(itau)/REAL(day_step),
+     &                        REAL(itau)/REAL(day_step)
+     &                        +time_0-floor(time_0),
      &                        vcov,ucov,teta,q,masse,ps)
                 else
                  CALL dynredem1_p("restart.nc",
-     &             REAL(itau)/REAL(day_step)-(day_end-day_ini),
+     &             REAL(itau)/REAL(day_step)-(day_end-day_ini)
+     &                        +time_0-floor(time_0),
      &                        vcov,ucov,teta,q,masse,ps)
                 endif

trunk/LMDZ.MARS/README

@@ -3367 +3367 @@
 find cv.
 
+== 04/05/2021 == RV
+- update of r2507: correct ztime_fin for dynamico
+- Test for no writting Diagfi for Dynamico
+- Correction for Xios output : Change of calendar : start_date=0 as a diagfi, timestep for output physic=1s, day_length=ndtphys, it is needed to have output in days in the xml to have the correct time
+
 == 6/05/2021 == JN
 vdifc_mod update !!
@@ -3414 +3419 @@
 end of the physics integration. These are respectively triggered by seting
 flags "check_physics_inputs" and "check_physics_outputs" to .true.
+
+== 08/07/2021 == RV
+- update of r2507: correction for time output in the case of multiple restart files

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

@@ -516 +516 @@
       pdq(:,:,:) = 0.
 
-
 c 1. Initialisation:
 c -----------------
@@ -700 +699 @@
              call physdem0("restartfi.nc",longitude,latitude,
      &                   nsoilmx,ngrid,nlayer,nq,
-     &                   ptimestep,pday,time_phys,cell_area,
+     &                   ptimestep,pday,0.,cell_area,
      &                   albedodat,inertiedat,zmea,zstd,zsig,zgam,zthe,
      &                   hmons,summit,base)
@@ -706 +705 @@
              call physdem0("restartfi.nc",longitude,latitude,
      &                   nsoilmx,ngrid,nlayer,nq,
-     &                   ptimestep,float(day_end),time_phys,cell_area,
+     &                   ptimestep,float(day_end),0.,cell_area,
      &                   albedodat,inertiedat,zmea,zstd,zsig,zgam,zthe,
      &                   hmons,summit,base)
@@ -754 +753 @@
 #ifdef CPP_XIOS      
       ! update XIOS time/calendar
-      call update_xios_timestep
-#endif      
+      call update_xios_timestep     
+#endif 
+
+
 
 c     Initialize various variables
@@ -1246 +1247 @@
      &                pdqtop,wtop,dsodust,dsords,dsotop,
      &                tau_pref_scenario,tau_pref_gcm)
-     
                    
 c      update the tendencies of both dust after vertical transport
@@ -1558 +1558 @@
      &                nq,tau,tauscaling,rdust,rice,nuice,
      &                rsedcloud,rhocloud,totcloudfrac)
-
 c Temperature variation due to latent heat release
            if (activice) then
@@ -1662 +1661 @@
      &           rhocloud, rsedcloudco2,rhocloudco2,zzlev,zdqssed_co2,
      &           pdu,pu,zcondicea_co2microp, co2ice)
-
 
 c Temperature variation due to latent heat release
@@ -1867 +1865 @@
      $                   zdqcloud,zdqscloud,tau(:,1),co2ice,
      $                   pu,pdu,pv,pdv,surfdust,surfice)
-
             endif ! of if (modulo(icount-1,ichemistry).eq.0)
 
@@ -2338 +2335 @@
 
           if (ecritstart.GT.0) then !IF MULTIPLE RESTARTS nothing change
-          ztime_fin = pday + ptime  + ptimestep/(float(iphysiq)*daysec)
-     .               - day_ini - time_phys
+          ztime_fin = pday - day_ini + ptime  
+     .               + ptimestep/(float(iphysiq)*daysec)
           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)
+          ztime_fin = pday - day_ini-(day_end-day_ini)
+     .               + ptime  + ptimestep/(float(iphysiq)*daysec)
           endif
 
@@ -3888 +3885 @@
       CALL send_xios_field("u",zu)
       CALL send_xios_field("v",zv)
+
       !CREATE IF CO2CYCLE
-      !if (tracer.and.(igcm_co2.ne.0)) then
-      !   CALL send_xios_field("co2",zq(1,1,igcm_co2))
-      !endif
-
+      if (tracer.and.(igcm_co2.ne.0)) then
+         CALL send_xios_field("co2",zq(:,:,igcm_co2))
+      endif
 
       if (lastcall.and.is_omp_master) then