Changeset 1760 for trunk

Timestamp:

Jul 28, 2017, 12:54:31 PM (7 years ago)

Author:

emillour

Message:

Venus and Generic GCMS:
Corrections for the XIOS calendar; it must first be defined and operations
(e.g. definition of start_date) must come afterwards.
Note that for the Generic model where number of month/year and
number of days per month may vary from one simulation to the next, it
might be better to define the calendar via the XML file than in the code.
EM

Location:

trunk

Files:

• LMDZ.GENERIC/libf/phystd/xios_output_mod.F90 (modified) (1 diff)
• LMDZ.VENUS/libf/phyvenus/xios_output_mod.F90 (modified) (1 diff)

trunk/LMDZ.GENERIC/libf/phystd/xios_output_mod.F90

@@ -101 +101 @@
 !$OMP MASTER
     ! 3. Declare calendar and time step
-    if (prt_level>=10) write(lunout,*) "initialize_xios_output: build calendar"
+    if (prt_level>=10) then
+     write(lunout,*) "initialize_xios_output: build calendar"
+    endif
     timestep%second=dtphys
-    ! time origin of the simulation (default: 1st year/1st month/1st day, Ls=0)
-    time_origin=xios_date(1,1,1,0,0,0)
-    ! start date of the simulation (i.e time elapsed since last Ls=0)
-    start_date=xios_date(1,1,1,0,0,nint((day+timeofday)*daysec))
+    if (nint(dtphys).ne.dtphys) then
+      write(*,*) "initialize_xios_output: warning physics timestep is not an integer!"
+    endif
+    if (nint(daysec).ne.daysec) then
+      write(*,*) "initialize_xios_output: warning day length is not an integer!"
+    endif
+    ! Important: do no operations involving dates and calendars
+    ! before defining the calendar!
     CALL xios_define_calendar(type="user_defined", &
                               timestep=timestep, &
                               day_length=nint(daysec), &
-                              start_date=start_date, &
-                              time_origin=time_origin, &
                               month_lengths=[30,30,30,30,30,30,30,30,30,30,30,30])
-    
+    !NB: it would make more sense to define months and their length in the
+    ! xml files and not to have them hard coded here.... to be improved...
+    
+    ! time origin of the simulation (default: 1st year/1st month/1st day, Ls=0)
+    time_origin=xios_date(1,1,1,0,0,0)
+    CALL xios_set_time_origin(time_origin=time_origin)
+!    if (prt_level>=10) then
+     write(lunout,*) "initialize_xios_output: time_origin=",time_origin
+!    endif
+
+    ! 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)
+    call xios_set_start_date(start_date=start_date)
+    if (prt_level>=10) then
+     write(lunout,*) "initialize_xios_output: start_date=",start_date
+    endif
+
     ! 4. Finalize the context:
     if (prt_level>=10) write(*,*) "initialize_xios_output: call wxios_closedef"

trunk/LMDZ.VENUS/libf/phyvenus/xios_output_mod.F90

@@ -102 +102 @@
 !$OMP MASTER
     ! 3. Declare calendar and time step
-    if (prt_level>=10) write(lunout,*) "initialize_xios_output: build calendar"
-    timestep%second=dtphys
-    ! time origin of the simulation (default: 1st year/1st month/1st day, Ls=0)
-    time_origin=xios_date(1,1,1,0,0,0)
-    ! start date of the simulation (i.e time elapsed since last Ls=0)
-    start_date=xios_date(1,1,1,0,0,nint((day+timeofday)*daysec))
+    if (prt_level>=10) then
+     write(lunout,*) "initialize_xios_output: build calendar"
+    endif
+    timestep%second=nint(dtphys)
+    if (nint(dtphys).ne.dtphys) then
+      write(*,*) "initialize_xios_output: warning physics timestep is not an integer!"
+    endif
+    if (nint(daysec).ne.daysec) then
+      write(*,*) "initialize_xios_output: warning day length is not an integer!"
+    endif
+    ! Important: do no operations involving dates and calendars
+    ! before defining the calendar!
     CALL xios_define_calendar(type="user_defined", &
                               timestep=timestep, &
                               day_length=nint(daysec), &
-                              start_date=start_date, &
-                              time_origin=time_origin, &
-                              month_lengths=[2])
+                              month_lengths=[2]) ! one month, 2 days long
+
+    ! time origin of the simulation (default: 1st year/1st month/1st day, Ls=0)
+    time_origin=xios_date(1,1,1,0,0,0)
+    CALL xios_set_time_origin(time_origin=time_origin)
+    if (prt_level>=10) then
+     write(lunout,*) "initialize_xios_output: time_origin=",time_origin
+    endif
+
+    ! 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)
+    call xios_set_start_date(start_date=start_date)
+    if (prt_level>=10) then
+     write(lunout,*) "initialize_xios_output: start_date=",start_date
+    endif
     
     ! 4. Finalize the context: