Changeset 3760 for trunk

Timestamp:

May 13, 2025, 6:05:05 PM (7 weeks ago)

Author:

emillour

Message:

Pluto PCM:
Fix issue with parallelism in writediagsoil. And introduce the "diagsoil"
flag to trigger outputing a diagsoil.nc file or not.
EM

Location:

trunk/LMDZ.PLUTO

Files:

• changelog.txt (modified) (1 diff)
• libf/phypluto/inifis_mod.F90 (modified) (2 diffs)
• libf/phypluto/writediagsoil.F90 (modified) (6 diffs)

trunk/LMDZ.PLUTO/changelog.txt

@@ -1874 +1874 @@
 Some update/cleanup of examples in "startarchive2icosa", now that the
 "rearrange" step is no longer needed.
+
+== 13/05/2025 == EM
+Fix issue with parallelism in writediagsoil. And introduce the "diagsoil"
+flag to trigger outputing a diagsoil.nc file or not.
+

trunk/LMDZ.PLUTO/libf/phypluto/inifis_mod.F90

@@ -26 +26 @@
   use surfdat_h
   use wstats_mod, only: callstats
+  use writediagsoil_mod, only: diagsoil
   use ioipsl_getin_p_mod, only : getin_p
   use mod_phys_lmdz_para, only : is_parallel, is_master, bcast
@@ -261 +262 @@
 
      if (is_master) write(*,*) trim(rname)//&
+       ": Write sub-surface fields in file diagsoil.nc ?"
+     diagsoil=.false. ! default value
+     call getin_p("diagsoil",diagsoil)
+     if (is_master) write(*,*) trim(rname)//" diagsoil = ",diagsoil
+
+     if (is_master) write(*,*) trim(rname)//&
        ": Test energy conservation of model physics ?"
      enertest=.false. ! default value

trunk/LMDZ.PLUTO/libf/phypluto/writediagsoil.F90

@@ -2 +2 @@
 
 implicit none
+
+logical,save :: diagsoil ! global flag to trigger generating a diagsoil.nc
+                         ! file or not. Initialized in inifis()
 
 contains
@@ -80 +83 @@
 #endif
 
-! 0. This routine shoul only be used in lon-lat case
+! 0. Do we ouput a diagsoil.nc file? If not just bail out now.
+if(.not.diagsoil) return
+
+! This routine should only be used in lon-lat case
 if (grid_type==unstructured) then
-  return
+  write(*,*) "writediagsoil: Error !!!"
+  write(*,*) "diagsoil.nc outputs not possible on unstructured grids!!"
+  call abort_physic("writediagsoil","impossible on unstructured grid",1)
 endif
 
@@ -96 +104 @@
     write(*,*) "   firstname string not long enough!!"
     write(*,*) "   increase its size to at least ",len_trim(name)
-    stop
+    call abort_physic("writediagsoil","firstname too short",1)
   endif
 
@@ -107 +115 @@
    if (ierr.ne.NF_NOERR) then
     write(*,*)'writediagsoil: Error, failed creating file '//trim(filename)
-    stop
+    call abort_physic("writediagsoil","failed creating"//trim(filename),1)
    endif
+  endif ! of if (is_master)
 
 #ifdef CPP_PARA
@@ -120 +129 @@
 #endif
 
+  if (is_master) then
    ! build inertia() and area()
    if (klon_glo>1) then
@@ -187 +197 @@
      if (ierr.ne.NF_NOERR) then
       write(*,*)"writediagsoil: Failed writing date to time variable"
-      stop
+      call abort_physic("writediagsoil","failed writing time",1) 
      endif
     endif ! of if (is_master)