Changeset 2563 for trunk/LMDZ.MARS/libf/aeronomars

Timestamp:

Sep 21, 2021, 1:55:55 PM (3 years ago)

Author:

emillour

Message:

Mars GCM:
Improve wstats: the callstats flag is now embedded within wstats and checked
internaly so no need to have some "if (callstats)" conditions around calls
to wstats anymore.
In addition: wstats now looks for an (optional) stats.def file in the
directory where the GCM is run to know which variable should be included
in the stats.nc file. The stats.def ASCII file should simply contain
one variable name per line, in the same way as the diagfi.def file for
diagfi outputs. If there is no stats.def file then all variables sent to
wstats will be in the stats.nc file (which matches the behaviour prior to
this improvement).
EM

Location:

trunk/LMDZ.MARS/libf/aeronomars

Files:

• calchim_mod.F90 (modified) (3 diffs)
• surfacearea.F (modified) (3 diffs)

trunk/LMDZ.MARS/libf/aeronomars/calchim_mod.F90

@@ -31 +31 @@
       use photolysis_mod, only: init_photolysis, nphot
       use iono_h, only: temp_elect
-      use wstats_mod, only: callstats, wstats
+      use wstats_mod, only: wstats
 
       implicit none
@@ -953 +953 @@
 !            endif
             
-            if (callstats) then
                call wstats(ngrid,'jo3','j o3->o1d',       &
                            's-1',3,jo3_3d(1,1))
@@ -962 +961 @@
                call wstats(ngrid,'mmean','mean molecular mass',       &
                            'g.mole-1',3,mmean(1,1))
-            endif
          end if ! of if (ngrid.gt.1)
       end if ! of if (output)

trunk/LMDZ.MARS/libf/aeronomars/surfacearea.F

@@ -9 +9 @@
       use conc_mod, only: rnew
       use comcstfi_h, only: pi
-      use wstats_mod, only: callstats, wstats
+      use wstats_mod, only: wstats
       implicit none
 
@@ -114 +114 @@
 ! write diagnostics in micron2/cm3
       
-      if (callstats) then
-        call wstats(ngrid,"surfdust", "Dust surface area",
+      call wstats(ngrid,"surfdust", "Dust surface area",
      $            "micron2 cm-3",3,surfdust*1.e6)
-        call wstats(ngrid,"surfice", "Ice cloud surface area",
+      call wstats(ngrid,"surfice", "Ice cloud surface area",
      $            "micron2 cm-3",3,surfice*1.e6)
-      endif
+
       call writediagfi(ngrid,"surfdust", "Dust surface area",
      $            "micron2 cm-3",3,surfdust*1.e6)
@@ -125 +124 @@
      $            "micron2 cm-3",3,surfice*1.e6)
 
-      return
       end