Changeset 3754 for LMDZ6/branches/Optimisation_LMDZ/libf/phylmd

Timestamp:

Jul 8, 2020, 7:49:08 PM (4 years ago)

Author:

adurocher

Message:

Fix conditional compilation to compile without XIOS

Location:

LMDZ6/branches/Optimisation_LMDZ/libf/phylmd

Files:

• iophy_xios.f90 (modified) (6 diffs)
• phys_output_write_interface_mod.F90 (added)
• phys_output_write_mod.F90 (modified) (1 diff)
• phys_output_write_xios_mod.f90 (modified) (2 diffs)
• phys_output_write_xios_preprocess.F90 (modified) (1 diff)
• physiq_mod.F90 (modified) (4 diffs)
• xios_interface.F90 (added)

LMDZ6/branches/Optimisation_LMDZ/libf/phylmd/iophy_xios.f90

@@ -2 +2 @@
 ! ok_all_xml must be true
 MODULE iophy_xios
-  use iophy, only: npstn, nptabij, check_dim
+  use iophy, only: check_dim
   implicit none
 
@@ -21 +21 @@
     USE mod_phys_lmdz_para, ONLY: is_master
     USE phys_output_var_mod, ONLY: ctrl_out
-    USE xios, ONLY: xios_field_is_active
+    USE xios_interface, ONLY: xios_field_is_active
     USE print_control_mod, ONLY: lunout
     IMPLICIT NONE
@@ -47 +47 @@
     USE phys_output_var_mod, ONLY: ctrl_out
     USE print_control_mod, ONLY: lunout
-    USE xios, ONLY: xios_field_is_active
+    USE xios_interface, ONLY: xios_field_is_active
     IMPLICIT NONE
     INCLUDE 'clesphys.h'
@@ -74 +74 @@
                                   jj_nb, klon_mpi, is_master
     USE mod_grid_phy_lmdz, ONLY: nbp_lon, grid_type, unstructured, regular_lonlat
-    USE xios, ONLY: xios_send_field
+    USE xios_interface, ONLY: xios_send_field
     USE print_control_mod, ONLY: lunout
 
@@ -120 +120 @@
     USE mod_phys_lmdz_para, ONLY: gather_omp, grid1Dto2D_mpi, &
                                   jj_nb, klon_mpi, is_master
-    USE xios, ONLY: xios_send_field
+    USE xios_interface, ONLY: xios_send_field
     USE mod_grid_phy_lmdz, ONLY: nbp_lon, grid_type, regular_lonlat, unstructured
     USE print_control_mod, ONLY: lunout
@@ -167 +167 @@
 
   SUBROUTINE histwrite0d_xios(field_name, field)
-    USE xios, ONLY: xios_send_field
+    USE xios_interface, ONLY: xios_send_field
     USE mod_phys_lmdz_para, ONLY: is_master
     USE print_control_mod, ONLY: lunout

LMDZ6/branches/Optimisation_LMDZ/libf/phylmd/phys_output_write_mod.F90

@@ -460 +460 @@
  !      iinitend = 1
  !   ENDIF
+   if( ok_all_xml ) call abort_physic("phys_output_write", "Support of this IO backend with ok_all_xml=.true. is deprecated : use phys_output_write_xios instead", 1)
 
 #ifdef CPP_XIOS

LMDZ6/branches/Optimisation_LMDZ/libf/phylmd/phys_output_write_xios_mod.f90

@@ -326 +326 @@
     USE print_control_mod, ONLY: prt_level, lunout
 
-    USE xios
+    USE xios_interface, ONLY : CPP_XIOS_defined, xios_fieldgroup, xios_field, xios_get_handle, xios_add_child, xios_set_attr, xios_update_calendar
     USE wxios, ONLY: wxios_closedef, missing_val, wxios_set_context
     USE vertical_layers_mod, ONLY: presnivs
@@ -382 +382 @@
     REAL, DIMENSION(klon)      :: zrho, zt
 
+    if( .not. CPP_XIOS_defined ) call abort_physic("phys_output_write_xios", "This io backend can only be used when LMDZ is compiled with XIOS support",1 )
     if( .not. ok_all_xml ) call abort_physic("phys_output_write_xios", "This io backend only supports ok_all_xml = .true.", 1)
 

LMDZ6/branches/Optimisation_LMDZ/libf/phylmd/phys_output_write_xios_preprocess.F90

@@ -1 @@
-#ifndef CPP_XIOS
-#error "CPP_XIOS must be defined to compile this file"
-#endif
-#ifndef CPP_IOIPSL_NO_OUTPUT
-#error "CPP_IOIPSL_NO_OUTPUT is not mandatory to compile this file"
-#endif
-
 MODULE phys_output_write_xios_preprocess
 

LMDZ6/branches/Optimisation_LMDZ/libf/phylmd/physiq_mod.F90

@@ -223 +223 @@
 #endif
 
-    USE phys_output_write_xios_mod
+    USE phys_output_write_interface_mod, only : phys_output_write, phys_output_write_xios
     USE fonte_neige_mod, ONLY  : fonte_neige_get_vars
     USE phys_output_mod
@@ -1694 +1694 @@
         ENDIF
 
-       CALL phys_output_write_xios(itap, pdtphys, paprs, pphis,                    &
+      if( ok_all_xml ) then
+         CALL phys_output_write_xios(itap, pdtphys, paprs, pphis,                    &
                               pplay, lmax_th, aerosol_couple,                 &
                               ok_ade, ok_aie, ok_volcan, ivap, iliq, isol, ok_sync,&
@@ -1700 +1701 @@
                               ptconvth, d_u, d_t, qx, d_qx, zmasse,           &
                               flag_aerosol, flag_aerosol_strat, ok_cdnc)
+      else
+         CALL phys_output_write(itap, pdtphys, paprs, pphis,                    &
+                              pplay, lmax_th, aerosol_couple,                 &
+                              ok_ade, ok_aie, ok_volcan, ivap, iliq, isol, ok_sync,&
+                              ptconv, read_climoz, clevSTD,                   &
+                              ptconvth, d_u, d_t, qx, d_qx, zmasse,           &
+                              flag_aerosol, flag_aerosol_strat, ok_cdnc)
+      endif 
 
 #ifdef CPP_XIOS
@@ -5111 +5120 @@
        flag_aerosol, flag_aerosol_strat, ok_cdnc)
 #else
-    CALL phys_output_write_xios(itap, pdtphys, paprs, pphis,  &
-         pplay, lmax_th, aerosol_couple,                 &
-         ok_ade, ok_aie, ok_volcan, ivap, iliq, isol,    & 
-         ok_sync, ptconv, read_climoz, clevSTD,          &
-         ptconvth, d_u, d_t, qx, d_qx, zmasse,           &
-         flag_aerosol, flag_aerosol_strat, ok_cdnc)
+   if( ok_all_xml ) then
+      CALL phys_output_write_xios(itap, pdtphys, paprs, pphis,                    &
+                             pplay, lmax_th, aerosol_couple,                 &
+                             ok_ade, ok_aie, ok_volcan, ivap, iliq, isol, ok_sync,&
+                             ptconv, read_climoz, clevSTD,                   &
+                             ptconvth, d_u, d_t, qx, d_qx, zmasse,           &
+                             flag_aerosol, flag_aerosol_strat, ok_cdnc)
+   else
+      CALL phys_output_write(itap, pdtphys, paprs, pphis,                    &
+                           pplay, lmax_th, aerosol_couple,                 &
+                           ok_ade, ok_aie, ok_volcan, ivap, iliq, isol, ok_sync,&
+                           ptconv, read_climoz, clevSTD,                   &
+                           ptconvth, d_u, d_t, qx, d_qx, zmasse,           &
+                           flag_aerosol, flag_aerosol_strat, ok_cdnc)
+   endif 
 #endif