Changeset 1896 for trunk/LMDZ.TITAN/libf/phytitan

Timestamp:

Jan 17, 2018, 4:20:00 PM (7 years ago)

Author:

jvatant

Message:

Merge EM modifs on phy_common and xios
from LMDZ.GENERIC to LMDZ.TITAN.
See logs from r1673, r1682 and r1760
--JVO

Location:

trunk/LMDZ.TITAN/libf/phytitan

Files:

• inifis_mod.F90 (modified) (2 diffs, 1 prop)
• physiq_mod.F90 (modified) (5 diffs, 1 prop)
• xios_output_mod.F90 (modified) (2 diffs, 1 prop)

trunk/LMDZ.TITAN/libf/phytitan/inifis_mod.F90

@@ -9 +9 @@
              prad,pg,pr,pcpp)
 
+  use init_print_control_mod, only: init_print_control
   use radinc_h, only: ini_radinc_h
   use datafile_mod
@@ -74 +75 @@
   REAL SSUM
  
+  ! Initialize flags lunout, prt_level, debug (in print_control_mod)
+  CALL init_print_control
+
   ! initialize constants in comcstfi_mod
   rad=prad

trunk/LMDZ.TITAN/libf/phytitan/physiq_mod.F90

@@ -39 +39 @@
       use vertical_layers_mod, only: presnivs, pseudoalt
       use ioipsl_getin_p_mod, only: getin_p
+      use mod_phys_lmdz_omp_data, ONLY: is_omp_master
 #ifdef CPP_XIOS      
       use xios_output_mod, only: initialize_xios_output, &
                                  update_xios_timestep, &
                                  send_xios_field
+      use wxios, only: wxios_context_init, xios_context_finalize
 #endif
       implicit none
@@ -520 +522 @@
 
 
+#ifdef CPP_XIOS
+        ! Initialize XIOS context
+        write(*,*) "physiq: call wxios_context_init"
+        CALL wxios_context_init
+#endif
+
 !        Read 'startfi.nc' file.
 !        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -625 +633 @@
                                      presnivs,pseudoalt)
 #endif
+         write(*,*) "physiq: end of firstcall"
       endif ! end of 'firstcall'
 
@@ -1328 +1337 @@
                           tsurf,tsoil,emis,q2,qsurf_hist,tankCH4)
          endif
-         
-      endif ! end of 'lastcall'
+    endif ! end of 'lastcall'
 
 
@@ -1519 +1527 @@
       CALL send_xios_field("u",zu)
       CALL send_xios_field("v",zv)
-      
+
+      if (lastcall.and.is_omp_master) then
+        write(*,*) "physiq: call xios_context_finalize"
+        call xios_context_finalize
+      endif
 #endif
 

trunk/LMDZ.TITAN/libf/phytitan/xios_output_mod.F90

@@ -26 +26 @@
                                 mpi_size, mpi_rank, klon_mpi, &
                                 is_sequential, is_south_pole_dyn
-  USE mod_grid_phy_lmdz, ONLY: nbp_lon, nbp_lat, klon_glo
+  USE mod_grid_phy_lmdz, ONLY: nbp_lon, nbp_lat, klon_glo, grid_type, unstructured
   USE print_control_mod, ONLY: lunout, prt_level
   USE mod_grid_phy_lmdz, ONLY: nbp_lon, nbp_lat
   USE regular_lonlat_mod, ONLY: lon_reg, lat_reg
   USE nrtype, ONLY: pi
-  USE wxios
+#ifdef CPP_XIOS
+  USE xios
+#endif
+  USE wxios, ONLY: wxios_domain_param, wxios_domain_param_unstructured, wxios_closedef
   IMPLICIT NONE
   
@@ -60 +63 @@
     ! 2. Declare horizontal domain
     ! Set values for the mask:
-    IF (mpi_rank == 0) THEN
-        data_ibegin = 0
-    ELSE 
-        data_ibegin = ii_begin - 1
-    END IF
-
-    IF (mpi_rank == mpi_size-1) THEN
-        data_iend = nbp_lon
-    ELSE
-        data_iend = ii_end + 1
-    END IF
-
-    if (prt_level>=10) then
-      write(lunout,*) "initialize_xios_output: mpirank=",mpi_rank," iibegin=",ii_begin , " ii_end=",ii_end," jjbegin=",jj_begin," jj_nb=",jj_nb," jj_end=",jj_end
-      write(lunout,*) "initialize_xios_output: mpirank=",mpi_rank," nbp_lon=",nbp_lon," nbp_lat=",nbp_lat
-      write(lunout,*) "initialize_xios_output: mpirank=",mpi_rank," data_ibegin=",data_ibegin," data_iend=",data_iend
-      write(lunout,*) "initialize_xios_output: mpirank=",mpi_rank," data_ibegin=",data_ibegin," data_iend=",data_iend
-      write(lunout,*) "initialize_xios_output: mpirank=",mpi_rank," is_south_pole=",is_south_pole_dyn
-    endif
-
+!    IF (mpi_rank == 0) THEN
+!        data_ibegin = 0
+!    ELSE 
+!        data_ibegin = ii_begin - 1
+!    END IF
+
+!    IF (mpi_rank == mpi_size-1) THEN
+!        data_iend = nbp_lon
+!    ELSE
+!        data_iend = ii_end + 1
+!    END IF
+
+!    if (prt_level>=10) then
+!      write(lunout,*) "initialize_xios_output: mpirank=",mpi_rank," iibegin=",ii_begin , " ii_end=",ii_end," jjbegin=",jj_begin," jj_nb=",jj_nb," jj_end=",jj_end
+!      write(lunout,*) "initialize_xios_output: mpirank=",mpi_rank," nbp_lon=",nbp_lon," nbp_lat=",nbp_lat
+!      write(lunout,*) "initialize_xios_output: mpirank=",mpi_rank," data_ibegin=",data_ibegin," data_iend=",data_iend
+!      write(lunout,*) "initialize_xios_output: mpirank=",mpi_rank," data_ibegin=",data_ibegin," data_iend=",data_iend
+!      write(lunout,*) "initialize_xios_output: mpirank=",mpi_rank," is_south_pole=",is_south_pole_dyn
+!    endif
+
+!$OMP END MASTER
+!$OMP BARRIER
     ! Initialize the XIOS domain coreesponding to this process:
     if (prt_level>=10) write(lunout,*) "initialize_xios_output: call wxios_domain_param"
-    CALL wxios_domain_param("dom_glo", is_sequential, nbp_lon, jj_nb, nbp_lon, nbp_lat, &
-                            1, nbp_lon, ii_begin, ii_end, jj_begin, jj_end,             &
-                            klon_mpi+2*(nbp_lon-1), data_ibegin, data_iend,             &
-                            lat_reg*(180./pi), lon_reg*(180./pi),                       &
-                            is_south_pole_dyn,mpi_rank)
-
+!    CALL wxios_domain_param("dom_glo", is_sequential, nbp_lon, jj_nb, nbp_lon, nbp_lat, &
+!                            1, nbp_lon, ii_begin, ii_end, jj_begin, jj_end,             &
+!                            klon_mpi+2*(nbp_lon-1), data_ibegin, data_iend,             &
+!                            lat_reg*(180./pi), lon_reg*(180./pi),                       &
+!                            is_south_pole_dyn,mpi_rank)
+
+    IF (grid_type==unstructured) THEN
+      CALL wxios_domain_param_unstructured("dom_glo")
+    ELSE
+      CALL wxios_domain_param("dom_glo")
+    ENDIF
+
+!$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"