Changeset 3870 for trunk/LMDZ.MARS/libf/phymars/writediagfi.F

Timestamp:

Jul 29, 2025, 3:51:19 PM (5 months ago)

Author:

jmauxion

Message:

Mars PCM:
In writediag* routines, the files are now opened and closed only at dump time instead of every physical step (sensible speed up in 1D mainly).
JM

File:

• trunk/LMDZ.MARS/libf/phymars/writediagfi.F (modified) (6 diffs)

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

@@ -74 +74 @@
       REAL area((nbp_lon+1),nbp_lat)
 
-      integer isample
+      integer, save :: isample
       integer ierr,ierr2
       integer i,j,l, ig0
@@ -122 +122 @@
 
 !***************************************************************
-! Compute the output rate
-
-      isample=steps_per_sol/outputs_per_sol
-
-!***************************************************************
 
 ! At very first call, check if there is a "diagfi.def" to use and read it
@@ -132 +127 @@
       IF (firstcall) THEN
          firstcall=.false.
+
+         ! Compute the output rate
+         isample=steps_per_sol/outputs_per_sol
 
 !$OMP MASTER
@@ -251 +249 @@
          ENDIF
 
+         ierr= NF_CLOSE(nid) ! Close the NETCDF file once initialized
+
          endif ! of if (is_master)
-
-      else
-
-         if (is_master) then
-           ! only the master is required to do this
-
-           ! Open the NetCDF file
-           ierr = NF_OPEN(fichnom,NF_WRITE,nid)
-         endif ! of if (is_master)
-
       endif ! if (firstnom.eq.'1234567890')
 
@@ -276 +266 @@
 
       if ( MOD(zitau+1,isample) .eq.0.) then
-
+      
 ! Compute/write/extend 'Time' coordinate (date given in days)
 ! (done every "first call" (at given time level) to writediagfi)
 ! Note: date is incremented as 1 step ahead of physics time
 !--------------------------------------------------------
-
         if (is_master) then
-           ! only the master is required to do this
-        if (nom.eq.firstnom) then
-        ! We have identified a "first call" (at given date)
-           ntime=ntime+1 ! increment # of stored time steps
-           ! compute corresponding date (in days and fractions thereof)
-           date=(zitau +1.)/steps_per_sol
-           ! Get NetCDF ID of 'Time' variable
-           ierr= NF_INQ_VARID(nid,"Time",varid)
-           ! Write (append) the new date to the 'Time' array
-!#ifdef NC_DOUBLE
-!           ierr= NF_PUT_VARA_DOUBLE(nid,varid,[ntime],[1],[date])
+          ! only the master is required to do this
+
+          ! Time to write data, open NETCDF file
+          ierr=NF_OPEN(fichnom,NF_WRITE,nid)
+
+          if (nom.eq.firstnom) then
+            ! We have identified a "first call" (at given date)
+            ntime=ntime+1 ! increment # of stored time steps
+            ! compute corresponding date (in days and fractions thereof)
+            date=(zitau +1.)/steps_per_sol
+            ! Get NetCDF ID of 'Time' variable
+            ierr= NF_INQ_VARID(nid,"Time",varid)
+            ! Write (append) the new date to the 'Time' array
+      !#ifdef NC_DOUBLE
+            ! ierr= NF_PUT_VARA_DOUBLE(nid,varid,[ntime],[1],[date])
 !#else
-           ierr= NF_PUT_VARA_REAL(nid,varid,[ntime],[1],[date])
+            ierr= NF_PUT_VARA_REAL(nid,varid,[ntime],[1],[date])
 !#endif
-           if (ierr.ne.NF_NOERR) then
-              write(*,*) "***** PUT_VAR matter in writediagfi_nc"
-              write(*,*) "***** with time"
-              write(*,*) 'ierr=', ierr,": ",NF_STRERROR(ierr)  
-c             call abort
-           endif
-
-           write(6,*)'WRITEDIAGFI: date= ', date
-        end if ! of if (nom.eq.firstnom)
-
+            if (ierr.ne.NF_NOERR) then
+                write(*,*) "***** PUT_VAR matter in writediagfi_nc"
+                write(*,*) "***** with time"
+                write(*,*) 'ierr=', ierr,": ",NF_STRERROR(ierr)  
+c               call abort
+            endif
+
+            write(6,*)'WRITEDIAGFI: date= ', date
+          end if ! of if (nom.eq.firstnom)
         endif ! of if (is_master)
 
@@ -621 +613 @@
         endif ! of if (dim.eq.3) elseif(dim.eq.2)...
 
+        if (is_master) then
+          ! Close until next variable to dump or next dump iteration
+          ierr= NF_CLOSE(nid)
+        endif
+
       endif ! of if ( MOD(zitau+1,isample) .eq.0.)
 
-      if (is_master) then
-        ierr= NF_CLOSE(nid)
-      endif
-
       end