Changeset 3225 for trunk/LMDZ.MARS/libf

Timestamp:

Feb 19, 2024, 11:38:05 AM (10 months ago)

Author:

emillour

Message:

Mars PCM:
Remove interactive checking with XIOS whether a field should be sent to it;
some yet unresolved issues arise when using this in mixed MPI-OpenMP mode...
EM

Location:

trunk/LMDZ.MARS/libf/phymars

Files:

• write_output_mod.F90 (modified) (14 diffs)
• xios_output_mod.F90 (modified) (2 diffs)

trunk/LMDZ.MARS/libf/phymars/write_output_mod.F90

@@ -35 +35 @@
 real,         intent(in) :: field
 
+logical :: is_active ! For XIOS, should this field be sent or not
+
 call writediagfi(ngrid,field_name,title,units,0,(/field/))
 #ifdef CPP_XIOS
-    ! only send the field to xios if the user asked for it
-    if (xios_is_active_field(field_name)) call send_xios_field(field_name,field)
+!is_active=xios_is_active_field(field_name)
+is_active=.true.
+    ! only send the field to xios if the user asked for it
+    if (is_active) call send_xios_field(field_name,field)
 #endif
 
@@ -63 +67 @@
 real, dimension(:), intent(in) :: field
 
+logical :: is_active ! For XIOS, should this field be sent or not
+
 call writediagfi(ngrid,field_name,title,units,2,field)
 #ifdef CPP_XIOS
-    ! only send the field to xios if the user asked for it
-    if (xios_is_active_field(field_name)) call send_xios_field(field_name,field)
+!is_active=xios_is_active_field(field_name)
+is_active=.true.
+    ! only send the field to xios if the user asked for it
+    if (is_active) call send_xios_field(field_name,field)
 #endif
 
@@ -93 +101 @@
 character(*),         intent(in) :: units
 real, dimension(:,:), intent(in) :: field
+
+logical :: is_active ! For XIOS, should this field be sent or not
 
 if (size(field,2) == nsoilmx) then
@@ -101 +111 @@
 
 #ifdef CPP_XIOS
-    ! only send the field to xios if the user asked for it
-    if (xios_is_active_field(field_name)) call send_xios_field(field_name,field)
+!is_active=xios_is_active_field(field_name)
+is_active=.true.
+    ! only send the field to xios if the user asked for it
+    if (is_active) call send_xios_field(field_name,field)
 #endif
 
@@ -127 +139 @@
 integer,      intent(in) :: field
 
+logical :: is_active ! For XIOS, should this field be sent or not
+
 call writediagfi(ngrid,field_name,title,units,0,(/real(field)/))
 #ifdef CPP_XIOS
-    ! only send the field to xios if the user asked for it
-    if (xios_is_active_field(field_name)) call send_xios_field(field_name,(/real(field)/))
+!is_active=xios_is_active_field(field_name)
+is_active=.true.
+    ! only send the field to xios if the user asked for it
+    if (is_active) call send_xios_field(field_name,(/real(field)/))
 #endif
 
@@ -155 +171 @@
 integer, dimension(:), intent(in) :: field
 
+logical :: is_active ! For XIOS, should this field be sent or not
+
 call writediagfi(ngrid,field_name,title,units,2,real(field))
 #ifdef CPP_XIOS
-    ! only send the field to xios if the user asked for it
-    if (xios_is_active_field(field_name)) call send_xios_field(field_name,real(field))
+!is_active=xios_is_active_field(field_name)
+is_active=.true.
+    ! only send the field to xios if the user asked for it
+    if (is_active) call send_xios_field(field_name,real(field))
 #endif
 
@@ -185 +205 @@
 character(*),            intent(in) :: units
 integer, dimension(:,:), intent(in) :: field
+
+logical :: is_active ! For XIOS, should this field be sent or not
 
 if (size(field,2) == nsoilmx) then
@@ -192 +214 @@
 endif
 #ifdef CPP_XIOS
-    ! only send the field to xios if the user asked for it
-    if (xios_is_active_field(field_name)) call send_xios_field(field_name,real(field))
+!is_active=xios_is_active_field(field_name)
+is_active=.true.
+    ! only send the field to xios if the user asked for it
+    if (is_active) call send_xios_field(field_name,real(field))
 #endif
 
@@ -219 +243 @@
 ! Local argument used to convert logical to real array
 real, dimension(1) :: field_real
+logical :: is_active ! For XIOS, should this field be sent or not
 
 field_real = 0.
@@ -225 +250 @@
 call writediagfi(ngrid,field_name,title,units,0,field_real)
 #ifdef CPP_XIOS
-    ! only send the field to xios if the user asked for it
-    if (xios_is_active_field(field_name)) call send_xios_field(field_name,field_real)
+!is_active=xios_is_active_field(field_name)
+is_active=.true.
+    ! only send the field to xios if the user asked for it
+    if (is_active) call send_xios_field(field_name,field_real)
 #endif
 
@@ -252 +279 @@
 ! Local argument used to convert logical to real
 real, dimension(ngrid) :: field_real
+logical :: is_active ! For XIOS, should this field be sent or not
 
 field_real = 0.
@@ -258 +286 @@
 call writediagfi(ngrid,field_name,title,units,2,field_real)
 #ifdef CPP_XIOS
-    ! only send the field to xios if the user asked for it
-    if (xios_is_active_field(field_name)) call send_xios_field(field_name,field_real)
+!is_active=xios_is_active_field(field_name)
+is_active=.true.
+    ! only send the field to xios if the user asked for it
+    if (is_active) call send_xios_field(field_name,field_real)
 #endif
 
@@ -288 +318 @@
 ! Local argument used to convert logical to real
 real, allocatable, dimension(:,:) :: field_real
+logical :: is_active ! For XIOS, should this field be sent or not
 
 allocate(field_real(size(field,1),size(field,2)))
@@ -300 +331 @@
 
 #ifdef CPP_XIOS
-    ! only send the field to xios if the user asked for it
-    if (xios_is_active_field(field_name)) call send_xios_field(field_name,field_real)
+!is_active=xios_is_active_field(field_name)
+is_active=.true.
+    ! only send the field to xios if the user asked for it
+    if (is_active) call send_xios_field(field_name,field_real)
 #endif
 

trunk/LMDZ.MARS/libf/phymars/xios_output_mod.F90

@@ -309 +309 @@
  FUNCTION xios_is_active_field(field_id)
  USE xios, only: xios_field_is_active
- USE mod_phys_lmdz_para, only: bcast_omp
+ USE mod_phys_lmdz_omp_transfert, only: bcast_omp
  IMPLICIT NONE
    LOGICAL ::  xios_is_active_field
@@ -317 +317 @@
  ! to be in the output file(s)
 
+!$OMP BARRIER
 !$OMP MASTER 
    xios_is_active_field = xios_field_is_active(field_id)