Changeset 2514

Timestamp:

May 4, 2021, 10:23:43 AM (4 years ago)

Author:

romain.vande

Message:

Mars Dynamico : _ 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

Location:

trunk

Files:

• ICOSA_LMDZ/compile_occigen (modified) (1 diff)
• LMDZ.COMMON/arch/arch-gfortran.path (modified) (1 diff)
• LMDZ.MARS/libf/phymars/physiq_mod.F (modified) (1 diff)
• LMDZ.MARS/libf/phymars/writediagfi.F (modified) (2 diffs)
• LMDZ.MARS/libf/phymars/xios_output_mod.F90 (modified) (3 diffs)

trunk/ICOSA_LMDZ/compile_occigen

@@ -1 @@
-make_icosa_lmdz -p std -p_opt "-b 23x25 -s 1" -debug -parallel mpi_omp -arch X64_OCCIGEN -arch_path ../ARCH -job 8
-
+#make_icosa_lmdz -p mars -debug -parallel mpi_omp -arch X64_OCCIGEN -arch_path ../ARCH -job 8 -full
+#make_icosa_lmdz -p mars -debug -parallel mpi_omp -arch X64_OCCIGEN -arch_path ../ARCH -job 8
+#make_icosa_lmdz -p mars -parallel mpi_omp -arch X64_OCCIGEN -arch_path ../ARCH -job 8 -full
+make_icosa_lmdz -p mars -parallel mpi -arch X64_OCCIGEN -arch_path ../ARCH -job 8
+#make_icosa_lmdz -p mars -debug -parallel mpi -arch X64_OCCIGEN -arch_path ../ARCH -job 8

trunk/LMDZ.COMMON/arch/arch-gfortran.path

@@ -2 +2 @@
 
 NETCDF_LIBDIR="-L$NETCDF/lib"
-NETCDF_LIB="-lnetcdff -lnetcdf"
+NETCDF_LIB="-lnetcdf -lnetcdff"
 NETCDF_INCDIR="-I$NETCDF/include"
 

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

@@ -2322 +2322 @@
      .                  - day_ini - time_phys
              ENDIF
+             if (ecritstart==0) then
+                ztime_fin = ztime_fin-(day_end-day_ini)
+             endif
 
           ELSE ! IF LMDZ

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

@@ -45 +45 @@
      &                               is_master, gather
       USE mod_grid_phy_lmdz, only : klon_glo, Grid1Dto2D_glo,
-     &                              nbp_lon, nbp_lat, nbp_lev
+     &                              nbp_lon, nbp_lat, nbp_lev,
+     &                              grid_type, unstructured
       implicit none
 
@@ -114 +115 @@
       real areafi_glo(ngrid) ! mesh area on global physics grid
 #endif
+
+      if (grid_type==unstructured) then
+           return
+      endif
 
 !***************************************************************

trunk/LMDZ.MARS/libf/phymars/xios_output_mod.F90

@@ -104 +104 @@
      write(lunout,*) "initialize_xios_output: build calendar"
     endif
-    timestep%second=dtphys
+    timestep%second=1
     if (nint(dtphys).ne.dtphys) then
       write(*,*) "initialize_xios_output: warning physics timestep is not an integer!"
-      timestep%second=nint(dtphys)
     endif
     if (nint(daysec).ne.daysec) then
@@ -116 +115 @@
     CALL xios_define_calendar(type="user_defined", &
                               timestep=timestep, &
-                              day_length=nint(daysec), &
+                              day_length=nint(daysec/dtphys), &
                               month_lengths=[61,66,66,65,60,54,50,46,47,47,51,56])
     !NB: it would make more sense to define months and their length in the
@@ -130 +129 @@
     ! Now define the start time of this simulation
     ! NB: we substract dtphys because we want to set the origin of the time axis
-    start_date=time_origin+xios_duration(0,0,day,0,0,timeofday*daysec-dtphys)
+    start_date=time_origin
     call xios_set_start_date(start_date=start_date)
     if (prt_level>=10) then