Changeset 4171 for LMDZ6/branches/LMDZ-ECRAD/libf/phylmd/iophy.F90

Timestamp:

Jun 17, 2022, 4:24:49 PM (2 years ago)

Author:

lguez

Message:

Sync latest trunk changes to branch LMDZ-ECRAD.

Location:

LMDZ6/branches/LMDZ-ECRAD

Files:

• . (modified) (1 prop)
• libf/phylmd/iophy.F90 (modified) (7 diffs)

LMDZ6/branches/LMDZ-ECRAD/libf/phylmd/iophy.F90

@@ -811 +811 @@
     IMPLICIT NONE
 
-    CHARACTER(LEN=20)                :: nam_var
-    INTEGER, DIMENSION(nfiles)      :: flag_var
+    CHARACTER(LEN=*), INTENT(INOUT) :: nam_var
+    INTEGER,          INTENT(INOUT) :: flag_var(nfiles)
 
     IF(prt_level>10) WRITE(lunout,*)'Avant getin: nam_var flag_var ',nam_var,flag_var(:)
@@ -975 +975 @@
   USE mod_grid_phy_lmdz, ONLY : nbp_lon, nbp_lat, grid_type, unstructured, regular_lonlat
 #ifdef CPP_XIOS
-  USE xios, ONLY: xios_send_field
+  USE xios, ONLY: xios_send_field, xios_field_is_active
 #endif
   USE print_control_mod, ONLY: lunout, prt_level
@@ -996 +996 @@
   INTEGER :: ip
   REAL, ALLOCATABLE, DIMENSION(:) :: fieldok
+  logical, save :: is_active = .true.
 
   IF (check_dim .AND. is_master) WRITE(lunout,*)'histwrite2d_phy for ',trim(var%name)
@@ -1035 +1036 @@
 
   ELSE
+#ifdef CPP_XIOS
+    IF (ok_all_xml) THEN
+      !$omp barrier
+      !$omp master
+      is_active = xios_field_is_active(var%name, at_current_timestep_arg=.false.)
+      !$omp end master
+      !$omp barrier
+      IF(.not. is_active) RETURN
+    ENDIF
+#endif
 
     !Et sinon on.... écrit
@@ -1176 +1187 @@
   USE mod_grid_phy_lmdz, ONLY : nbp_lon, nbp_lat, grid_type, regular_lonlat, unstructured
 #ifdef CPP_XIOS
-  USE xios, ONLY: xios_send_field
+  USE xios, ONLY: xios_send_field, xios_field_is_active
 #endif
   USE print_control_mod, ONLY: prt_level,lunout
@@ -1195 +1206 @@
   INTEGER, ALLOCATABLE, DIMENSION(:) :: index3d
   REAL,ALLOCATABLE, DIMENSION(:,:) :: fieldok
+  logical, save :: is_active = .true.
 
   IF (check_dim .AND. is_master) WRITE(lunout,*)'histwrite3d_phy for ', trim(var%name)
@@ -1222 +1234 @@
       CALL bcast_omp(swaerofree_diag)
   ELSE
+#ifdef CPP_XIOS
+    IF (ok_all_xml) THEN
+      !$omp barrier
+      !$omp master
+      is_active = xios_field_is_active(var%name, at_current_timestep_arg=.false.)
+      !$omp end master
+      !$omp barrier
+      IF(.not. is_active) RETURN
+    ENDIF
+#endif
+
     !Et sinon on.... écrit
-
     IF (SIZE(field,1)/=klon .AND. SIZE(field,1)/=klev .AND. SIZE(field,1)/=klev+1) CALL abort_physic('iophy::histwrite3d_phy','Field first DIMENSION not equal to klon/klev',1)