Changeset 3282 for trunk/LMDZ.MARS

Timestamp:

Mar 21, 2024, 7:52:55 AM (8 months ago)

Author:

emillour

Message:

Mars PCM:
Fix a buggy behavior of wstats: it would fail when using a stats.def file and
when the first (at every time step) variable sent to wstats() was not part of
those listed in stats.def
EM

Location:

trunk/LMDZ.MARS

Files:

• changelog.txt (modified) (1 diff)
• libf/phymars/wstats_mod.F90 (modified) (5 diffs)

trunk/LMDZ.MARS/changelog.txt

@@ -4578 +4578 @@
 == 20/03/2024 == LL
 Small update of soil properties (porosity) when running soilwater to simulate the evolution of massive water ice
+
+== 21/03/2024 == EM
+Fix a buggy behavior of wstats: it would fail when using a stats.def file and
+when the first (at every time step) variable sent to wstats() was not part of 
+those listed in stats.def

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

@@ -26 +26 @@
 ! Main routine to call to trigger writing a given field to the "stats.nc" file 
 
-use mod_phys_lmdz_para, only : is_mpi_root, is_master, gather, klon_mpi_begin
+use mod_phys_lmdz_para, only : is_mpi_root, is_master, klon_mpi_begin
+use mod_phys_lmdz_transfert_para, only: gather, bcast
 use mod_grid_phy_lmdz, only : klon_glo, Grid1Dto2D_glo, &
                               nbp_lon, nbp_lat, nbp_lev, &
@@ -53 +54 @@
 
 ! Added to read an optional stats.def file to select outputs
+logical,save :: check_stats_def=.TRUE. ! to keep track of if stats.def was checked
 logical,save :: stats_def ! .true. if there is a stats.def file
 integer,save :: n_name_def ! number of fields to output in stats.nc
-! NB: stats_def and n_name_def do not need be threadprivate
 integer,parameter :: n_name_def_max=199 ! max number of fields to output
 character(len=120),save :: name_def(n_name_def_max)
 logical :: getout ! to trigger an early exit if variable not in output list
 
-!$OMP THREADPRIVATE(stats_def,n_name_def,name_def)
+!$OMP THREADPRIVATE(check_stats_def,stats_def,n_name_def,name_def)
 
 ! Added to work in parallel mode
@@ -89 +90 @@
 endif
 
-! 1. Initialization (creation of stats.nc file)
-if (firstcall) then
-   firstcall=.false.
-
-!$OMP MASTER
-  ! open stats.def definition file if there is one
-  open(99,file="stats.def",status='old',form='formatted',&
-       iostat=ierr)
-  if (ierr.eq.0) then
+if (check_stats_def) then
+  ! this step only needs be made a single unique time
+  ! hence the chack_stats_def flag.
+  
+  if (is_master) then
+   ! Only the master reads the file
+   ! open stats.def definition file if there is one
+   open(99,file="stats.def",status='old',form='formatted',&
+        iostat=ierr)
+   if (ierr.eq.0) then
     stats_def=.true. ! yes there is a stats.def file
     write(*,*) "*****************"
@@ -114 +116 @@
     n_name_def=n-1
     close(99)
-  else
+   else
     stats_def=.false. ! no stats.def file; output all fields sent to wstats
-  endif ! of if (ierr.eq.0)
-!$OMP END MASTER
-!$OMP BARRIER
-
-   firstvar=trim((nom))
+   endif ! of if (ierr.eq.0)
+
+  endif ! of if (is_master)
+    
+  ! share the info gathered by master with all other cores
+  call bcast(stats_def)
+  call bcast(n_name_def)
+  do n=1,n_name_def
+    call bcast(name_def(n))
+  enddo
+  
+  check_stats_def=.false.
+endif ! of if (check_stats_def)
+
+! 1. Initialization (creation of stats.nc file)
+if (firstcall) then
+   firstcall=.false.
+
+   ! identify the first variable name with which wstats is called in
+   ! a time step
+   if (stats_def) then
+     ! check if "nom" is in the wanted output list. If it is then
+     ! it is the sought "first variable"; if not then skip all the
+     ! rest and reset "firstcall" to true
+     getout=.true.
+     do n=1,n_name_def
+       ! look for the variable's name in the list
+       if (trim(name_def(n)).eq.nom) then
+         getout=.false.
+         ! found it, no need to scan the rest of the list exit loop
+         firstvar=trim((nom))
+         exit
+       endif
+     enddo
+     if (getout) then
+       ! variable not in the list so exit routine now
+       firstcall=.true.
+       return
+     endif
+   else
+     ! without a stats.def, the very first call to stats contains first
+     ! variable name
+     firstvar=trim((nom))
+   endif ! of if (stats_def)
+   
+   ! initialize stats.nc file
    call inistats(ierr)
+   
+   ! allocate arrays that will be needed later
    if (klon_glo>1) then ! general case, 3D GCM
      allocate(mean3d(nbp_lon+1,nbp_lat,nbp_lev))
@@ -137 +182 @@
      allocate(dx2(1,1))
    endif
+
 endif ! of if (firstcall)