Changeset 4058 for trunk/LMDZ.MARS/libf/phymars

Timestamp:

Feb 10, 2026, 9:46:10 AM (7 days ago)

Author:

emillour

Message:

Mars PCM:
Add a "output_diagfi" (default .true.) flag so that the user can decide if
a diagfi.nc file should be outputted.
Also do some cleaning around the few remaining calls to writediagfi
or reference to it througout the code; write_output() should be used.
EM

Location:

trunk/LMDZ.MARS/libf/phymars

Files:

• conf_phys.F (modified) (2 diffs)
• physiq_mod.F (modified) (4 diffs)
• rocketduststorm_mod.F90 (modified) (1 diff)
• simpleclouds_mod.F (modified) (1 diff)
• topmons_mod.F90 (modified) (1 diff)
• vdif_kc.F (modified) (1 diff)
• write_output_mod.F90 (modified) (10 diffs)

trunk/LMDZ.MARS/libf/phymars/conf_phys.F

@@ -73 +73 @@
      &                        kernel_g,kernel_de,kernel_ti,coal_kg,
      &                        fullcoag
+      use write_output_mod, only: output_diagfi
 
       IMPLICIT NONE
@@ -176 +177 @@
          write(*,*) " callstats = ",callstats
 
+         write(*,*) "Write atmospheric fields in file diagfi.nc ?"
+         output_diagfi=.true. ! default value
+         call getin_p("output_diagfi",output_diagfi)
+         write(*,*) " output_diagfi = ",output_diagfi
+         
          write(*,*) "Write sub-surface fields in file diagsoil.nc ?"
          diagsoil=.false. ! default value

trunk/LMDZ.MARS/libf/phymars/physiq_mod.F

@@ -3265 +3265 @@
 #ifndef MESOINI
 
-c        ==========================================================
-c        WRITEDIAGFI: Outputs in netcdf file "DIAGFI", containing
-c          any variable for diagnostic (output with period
-c          "ecritphy", set in "run.def")
-c        ==========================================================
-c        WRITEDIAGFI can ALSO be called from any other subroutines
-c        for any variables !!
+!        ==========================================================
+!        write_output: Outputs in netcdf files, diagfi and/or diagsoil
+!                      or via XIOS (variable should then be also defined
+!                      in field_def_physics_mars.xml)
+!        ==========================================================
+!        write_output can be called from any other subroutines
+!        for any variables !!
          call write_output("emis","Surface emissivity","",
      &                  emis(:,iflat))
@@ -3702 +3702 @@
            endif ! (doubleq)
 
-           if (rdstorm) then  ! writediagfi tendencies stormdust tracers
+           if (rdstorm) then  ! output tendencies stormdust tracers
              call write_output('reffstormdust','reffstormdust',
      &                        'm',rstormdust(:,:)*ref_r0)
@@ -3925 +3925 @@
 c        ----------------------------------------------------------
 
-c        ----------------------------------------------------------
-c        Output in netcdf file "diagsoil.nc" for subterranean
-c          variables (output every "ecritphy", as for writediagfi)
-c        ----------------------------------------------------------
          ! Write soil temperature
         call write_output("soiltemp","Soil temperature","K",
@@ -4043 +4039 @@
 
 c        ==========================================================
-c        END OF WRITEDIAGFI
+c        END OF WRITING OUTPUTS
 c        ==========================================================
 #endif

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

@@ -526 +526 @@
         
 !=======================================================================
-! WRITEDIAGFI
+! OUTPUTS
 
         call write_output('rds_lapserate', &

trunk/LMDZ.MARS/libf/phymars/simpleclouds_mod.F

@@ -222 +222 @@
       end do
 
-c     if (hdo) then
-c           CALL WRITEDIAGFI(ngrid,'alpha_c',
-c    &                       'alpha_c',
-c    &                       ' ',3,alpha_c) 
-c     endif !hdo
 c------------------------------------------------------------------
       end subroutine simpleclouds

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

@@ -643 +643 @@
 
 ! **********************************************************************
-! WRITEDIAGFI
+! OUTPUTS
 ! **********************************************************************
 !               CALL write_output('wup_top', &

trunk/LMDZ.MARS/libf/phymars/vdif_kc.F

@@ -627 +627 @@
 c
 
-!        call writediagfi(ngrid,'vdif_kc_q2','','',3,q2(:,1:nlay))
-!        call writediagfi(ngrid,'vdif_kc_km','','',3,km(:,1:nlay))
-!        call writediagfi(ngrid,'vdif_kc_kn','','',3,kn(:,1:nlay))
-!        call writediagfi(ngrid,'vdif_kc_unsdz','','',3,unsdz(:,1:nlay))
-!        call writediagfi(ngrid,'vdif_kc_unsddecz','','',3,
-!     &                   unsdzdec(:,1:nlay))
-!        call writediagfi(ngrid,'vdif_kc_q','','',3,q(:,1:nlay))
-!        call writediagfi(ngrid,'vdif_kc_kmpre','','',3,
-!     &                   kmpre(:,1:nlay))
-!        call writediagfi(ngrid,'vdif_kc_long','','',3,long(:,1:nlay))
-!        call writediagfi(ngrid,'vdif_kc_sn','','',3,sn(:,1:nlay))
-!        call writediagfi(ngrid,'vdif_kc_sm','','',3,sm(:,1:nlay))
-
       END SUBROUTINE vdif_kc
 

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

@@ -13 +13 @@
 public write_output
 
+logical,public,save :: output_diagfi ! global flag to trigger generating
+                      ! a diagfi.nc file or not. Initialized in conf_phys()
+!$OMP THREADPRIVATE(output_diagfi)
+
+
 !-----------------------------------------------------------------------
 contains
@@ -37 +42 @@
 logical :: is_active ! For XIOS, should this field be sent or not
 
-call writediagfi(ngrid,field_name,title,units,0,(/field/))
+if (output_diagfi) call writediagfi(ngrid,field_name,title,units,0,(/field/))
 #ifdef CPP_XIOS
 !is_active=xios_is_active_field(field_name)
@@ -69 +74 @@
 logical :: is_active ! For XIOS, should this field be sent or not
 
-call writediagfi(ngrid,field_name,title,units,2,field)
+if (output_diagfi) call writediagfi(ngrid,field_name,title,units,2,field)
 #ifdef CPP_XIOS
 !is_active=xios_is_active_field(field_name)
@@ -107 +112 @@
     call writediagsoil(ngrid,field_name,title,units,3,field)
 else
-    call writediagfi(ngrid,field_name,title,units,3,field)
+  if (output_diagfi) call writediagfi(ngrid,field_name,title,units,3,field)
 endif
 
@@ -141 +146 @@
 logical :: is_active ! For XIOS, should this field be sent or not
 
-call writediagfi(ngrid,field_name,title,units,0,(/real(field)/))
+if (output_diagfi) call writediagfi(ngrid,field_name,title,units,0,(/real(field)/))
+
 #ifdef CPP_XIOS
 !is_active=xios_is_active_field(field_name)
@@ -173 +179 @@
 logical :: is_active ! For XIOS, should this field be sent or not
 
-call writediagfi(ngrid,field_name,title,units,2,real(field))
+if (output_diagfi) call writediagfi(ngrid,field_name,title,units,2,real(field))
+
 #ifdef CPP_XIOS
 !is_active=xios_is_active_field(field_name)
@@ -211 +218 @@
     call writediagsoil(ngrid,field_name,title,units,3,real(field))
 else
-    call writediagfi(ngrid,field_name,title,units,3,real(field))
+  if (output_diagfi) call writediagfi(ngrid,field_name,title,units,3,real(field))
 endif
 #ifdef CPP_XIOS
@@ -248 +255 @@
 if (field) field_real = 1.
 
-call writediagfi(ngrid,field_name,title,units,0,field_real)
+if (output_diagfi) call writediagfi(ngrid,field_name,title,units,0,field_real)
 #ifdef CPP_XIOS
 !is_active=xios_is_active_field(field_name)
@@ -284 +291 @@
 where (field) field_real = 1.
 
-call writediagfi(ngrid,field_name,title,units,2,field_real)
+if (output_diagfi) call writediagfi(ngrid,field_name,title,units,2,field_real)
+
 #ifdef CPP_XIOS
 !is_active=xios_is_active_field(field_name)
@@ -327 +335 @@
     call writediagsoil(ngrid,field_name,title,units,3,field_real)
 else
-    call writediagfi(ngrid,field_name,title,units,3,field_real)
+  if (output_diagfi) call writediagfi(ngrid,field_name,title,units,3,field_real)
 endif