Changeset 3055

Timestamp:

Sep 27, 2023, 2:54:29 PM (14 months ago)

Author:

emillour

Message:

Mars PCM:
Add extra tests for XIOS output: only combine and send fields to XIOS if the
user requests them in one of the output files.
EM

Location:

trunk/LMDZ.MARS

Files:

• changelog.txt (modified) (1 diff)
• libf/phymars/write_output_mod.F90 (modified) (18 diffs)
• libf/phymars/xios_output_mod.F90 (modified) (1 diff)

trunk/LMDZ.MARS/changelog.txt

@@ -4215 +4215 @@
 Upgrade of "testphys1d" to Fortran 90. Cleaning of the subroutine and minor optimizations of the code.
 Correction of a bug: 'inertiedat(1,1)' was overwritten by 'inertieice'.
+
+== 27/09/2023 == EM
+Add extra tests for XIOS output: only combine and send fields to XIOS if the
+user requests them in one of the output files.

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

@@ -17 +17 @@
   ! For a surface field
 #ifdef CPP_XIOS
+  use xios_output_mod, only: xios_is_active_field
   use xios_output_mod, only: send_xios_field
 #endif
@@ -30 +31 @@
   call writediagfi(ngrid,field_name,title,units,0,field)
 #ifdef CPP_XIOS 
-  call send_xios_field(field_name,field)
+  if (xios_is_active_field(field_name)) then
+    ! only send the field to xios if the user asked for it
+    call send_xios_field(field_name,field)
+  endif
 #endif
   
@@ -38 +42 @@
   ! For a surface field
 #ifdef CPP_XIOS
+  use xios_output_mod, only: xios_is_active_field
   use xios_output_mod, only: send_xios_field
 #endif
@@ -51 +56 @@
   call writediagfi(ngrid,field_name,title,units,2,field)
 #ifdef CPP_XIOS 
-  call send_xios_field(field_name,field)
+  if (xios_is_active_field(field_name)) then
+    ! only send the field to xios if the user asked for it
+    call send_xios_field(field_name,field)
+  endif
 #endif
   
@@ -59 +67 @@
   ! For a "3D" horizontal-vertical field
 #ifdef CPP_XIOS
+  use xios_output_mod, only: xios_is_active_field
   use xios_output_mod, only: send_xios_field
 #endif
@@ -78 +87 @@
   endif
 #ifdef CPP_XIOS 
-  call send_xios_field(field_name,field)
+  if (xios_is_active_field(field_name)) then
+    ! only send the field to xios if the user asked for it
+    call send_xios_field(field_name,field)
+  endif
 #endif
   
@@ -86 +98 @@
   ! For a surface field
 #ifdef CPP_XIOS
+  use xios_output_mod, only: xios_is_active_field
   use xios_output_mod, only: send_xios_field
 #endif
@@ -99 +112 @@
   call writediagfi(ngrid,field_name,title,units,0,real(field))
 #ifdef CPP_XIOS 
-  call send_xios_field(field_name,real(field))
+  if (xios_is_active_field(field_name)) then
+    ! only send the field to xios if the user asked for it
+    call send_xios_field(field_name,real(field))
+  endif
 #endif
   
@@ -107 +123 @@
   ! For a surface field
 #ifdef CPP_XIOS
+  use xios_output_mod, only: xios_is_active_field
   use xios_output_mod, only: send_xios_field
 #endif
@@ -120 +137 @@
   call writediagfi(ngrid,field_name,title,units,2,real(field))
 #ifdef CPP_XIOS 
-  call send_xios_field(field_name,real(field))
+  if (xios_is_active_field(field_name)) then
+    ! only send the field to xios if the user asked for it
+    call send_xios_field(field_name,real(field))
+  endif
 #endif
   
@@ -128 +148 @@
   ! For a "3D" horizontal-vertical field
 #ifdef CPP_XIOS
+  use xios_output_mod, only: xios_is_active_field
   use xios_output_mod, only: send_xios_field
 #endif
@@ -147 +168 @@
   endif
 #ifdef CPP_XIOS 
-  call send_xios_field(field_name,real(field))
+  if (xios_is_active_field(field_name)) then
+    ! only send the field to xios if the user asked for it
+    call send_xios_field(field_name,real(field))
+  endif
 #endif
   
@@ -155 +179 @@
   ! For a surface field
 #ifdef CPP_XIOS
+  use xios_output_mod, only: xios_is_active_field
   use xios_output_mod, only: send_xios_field
 #endif
@@ -173 +198 @@
   call writediagfi(ngrid,field_name,title,units,0,field_real)
 #ifdef CPP_XIOS 
-  call send_xios_field(field_name,field_real)
+  if (xios_is_active_field(field_name)) then
+    ! only send the field to xios if the user asked for it
+    call send_xios_field(field_name,field_real)
+  endif
 #endif
   
@@ -181 +209 @@
   ! For a surface field
 #ifdef CPP_XIOS
+  use xios_output_mod, only: xios_is_active_field
   use xios_output_mod, only: send_xios_field
 #endif
@@ -202 +231 @@
   call writediagfi(ngrid,field_name,title,units,2,field_real(:))
 #ifdef CPP_XIOS 
-  call send_xios_field(field_name,field_real)
+  if (xios_is_active_field(field_name)) then
+    ! only send the field to xios if the user asked for it
+    call send_xios_field(field_name,field_real)
+  endif
 #endif
   
@@ -210 +242 @@
   ! For a "3D" horizontal-vertical field
 #ifdef CPP_XIOS
+  use xios_output_mod, only: xios_is_active_field
   use xios_output_mod, only: send_xios_field
 #endif
@@ -242 +275 @@
 
 #ifdef CPP_XIOS 
-  call send_xios_field(field_name,field_real)
+  if (xios_is_active_field(field_name)) then
+    ! only send the field to xios if the user asked for it
+    call send_xios_field(field_name,field_real)
+  endif
 #endif
   

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

@@ -293 +293 @@
   END SUBROUTINE histwrite3d_xios
 
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+ FUNCTION xios_is_active_field(field_id)
+ USE xios, only: xios_field_is_active
+ USE mod_phys_lmdz_para, only: bcast_omp
+ IMPLICIT NONE
+   LOGICAL ::  xios_is_active_field
+   CHARACTER(LEN=*) :: field_id
+ 
+ ! check with XIOS if "field_id" is requested by the user
+ ! to be in the output file(s)
+
+!$OMP MASTER 
+   xios_is_active_field = xios_field_is_active(field_id)
+!$OMP END MASTER
+   CALL bcast_omp(xios_is_active_field)
+ END FUNCTION xios_is_active_field
+
 #endif