Changeset 4743 for LMDZ6/branches/Portage_acc/libf/phylmd/regr_horiz_time_climoz_m.F90

Timestamp:

Oct 30, 2023, 5:37:00 PM (7 months ago)

Author:

Laurent Fairhead

Message:

Merge of ACC branch with 4740 revision from trunk

Location:

LMDZ6/branches/Portage_acc

Files:

• . (modified) (1 prop)
• libf/phylmd/regr_horiz_time_climoz_m.F90 (modified) (8 diffs)

LMDZ6/branches/Portage_acc/libf/phylmd/regr_horiz_time_climoz_m.F90

@@ -66 +66 @@
   USE regular_lonlat_mod, ONLY: boundslon_reg, boundslat_reg, south, west, east
   USE slopes_m,           ONLY: slopes
-#ifdef CPP_XIOS
-  USE xios
-#endif
+  USE lmdz_xios
   USE mod_phys_lmdz_para, ONLY: is_mpi_root, is_master, is_omp_master, gather, gather_mpi, bcast_mpi, klon_mpi
   USE geometry_mod, ONLY : latitude_deg, ind_cell_glo
@@ -240 +238 @@
       CALL bcast_mpi(ntim_ou)
 
-#ifdef CPP_XIOS    
       IF (is_mpi_root) THEN
         CALL xios_set_domain_attr("domain_climoz",nj_glo=nlat_in, nj=nlat_in, jbegin=0, latvalue_1d=lat_in/deg2rad)
@@ -262 +259 @@
       CALL  xios_set_field_attr("tro3_out", enabled=.TRUE.)
       CALL  xios_set_field_attr("tro3_out", enabled=.TRUE.)
-#endif
       
       IF (first) THEN
@@ -415 +411 @@
     !=============================================================================
      IF (grid_type==unstructured) THEN
-#ifdef CPP_XIOS
        nlat_ou=klon_mpi
        
@@ -428 +423 @@
        CALL xios_send_field("tro3_in",o3_in3bis(:,:,:,:,:))
        CALL xios_recv_field("tro3_out",o3_regr_lonlat(1,:,:,:,:))
-#endif
      ELSE
           
@@ -462 +456 @@
      nlat_ou=nbp_lat
      IF (grid_type==unstructured) THEN
-#ifdef CPP_XIOS
        CALL xios_send_field('o3_out',o3_out3)
        ndims=3 
        ALLOCATE(o3_out3_glo(nlat_ou, nlev_in, ntim_ou, read_climoz))
        CALL gather_mpi(o3_out3(1,:,:,:,:), o3_out3_glo)
-#endif
      ENDIF
 
@@ -508 +500 @@
    
      IF (grid_type==unstructured) THEN
-#ifdef CPP_XIOS
        nlat_ou=klon_mpi
 
@@ -522 +513 @@
        IF(.NOT.lprev) o3_regr_lat(:,:, 0, :) = o3_regr_lat(:,:,12,:)
        IF(.NOT.lnext) o3_regr_lat(:,:,13, :) = o3_regr_lat(:,:, 1,:)
-#endif       
      
      ELSE