Changeset 3750 for trunk

Timestamp:

Apr 30, 2025, 5:54:42 PM (2 months ago)

Author:

afalco

Message:

Pluto: write restartfi during the run, not just at the end. It is written every diagfi_output_rate.
AF

Location:

trunk/LMDZ.PLUTO/libf/phypluto

Files:

• iostart.F90 (modified) (5 diffs)
• physiq_mod.F90 (modified) (5 diffs)

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

@@ -720 +720 @@
       IF (field_size==1) THEN
         ! input is a 1D "surface field" array
-        if (.not.present(time)) then ! for a time-independent field
+        ierr=NF90_INQ_VARID(nid_restart,field_name,nvarid)
+        if (ierr/=NF90_NOERR.or..not.present(time)) then ! for a time-independent field
           ierr=NF90_REDEF(nid_restart)
 #ifdef NC_DOUBLE
@@ -762 +763 @@
       ELSE IF (field_size==klev) THEN
         ! input is a 2D "atmospheric field" array
-        if (.not.present(time)) then ! for a time-independent field
+        ierr=NF90_INQ_VARID(nid_restart,field_name,nvarid)
+        if (ierr/=NF90_NOERR.or..not.present(time)) then ! for a time-independent field
           ierr=NF90_REDEF(nid_restart)
 #ifdef NC_DOUBLE
@@ -804 +806 @@
       ELSE IF (field_size==klevp1) THEN
         ! input is a 2D "interlayer atmospheric field" array
-        if (.not.present(time)) then ! for a time-independent field
+        ierr=NF90_INQ_VARID(nid_restart,field_name,nvarid)
+        if (ierr/=NF90_NOERR.or..not.present(time)) then ! for a time-independent field
           ierr=NF90_REDEF(nid_restart)
 #ifdef NC_DOUBLE
@@ -846 +849 @@
       ELSE IF (field_size==nsoilmx) THEN
         ! input is a 2D "subsurface field" array
-        if (.not.present(time)) then ! for a time-independent field
+        ierr=NF90_INQ_VARID(nid_restart,field_name,nvarid)
+        if (ierr/=NF90_NOERR.or..not.present(time)) then ! for a time-independent field
           ierr = NF90_REDEF(nid_restart)
 #ifdef NC_DOUBLE
@@ -893 +897 @@
       ENDIF
 
-      ! Check the writting of field to file went OK
+      ! Check the writing of field to file went OK
       if (ierr.ne.NF90_NOERR) then
         write(*,*) " Error phyredem(put_field_rgen) : failed writing ",trim(field_name)

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

@@ -406 +406 @@
       REAL zdum2(ngrid,nlayer)
       real ztim1,ztim2,ztim3, z1,z2
-      real ztime_fin
+      real ztime_restart
       real zdh(ngrid,nlayer)
       real gmplanet
@@ -490 +490 @@
       logical, save ::  check_physics_outputs=.false.
 !$OPM THREADPRIVATE(check_physics_inputs,check_physics_outputs)
+      LOGICAL write_restartfi
 
       ! Misc
@@ -1981 +1982 @@
       if (is_master) print*,'--> Ls =',zls*180./pi
 
+      write_restartfi = .false.
       if(lastcall) then
-         IF (grid_type==unstructured) THEN !IF DYNAMICO
-            ! DYNAMICO: no need to add a dynamics time step to ztime_fin
-            ztime_fin = ptime
-         ELSE ! LMDZ
-            ztime_fin = ptime + ptimestep/(float(iphysiq)*daysec)
-         ENDIF ! of IF (grid_type==unstructured)
-         !! Update surface ice distribution to iterate to steady state if requested
-         !! AF24: removed
-
-         ! endif
+         write_restartfi = .true.
+
          if (paleo) then
             ! time range for tendencies of ice flux qsurfyear
@@ -2072 +2066 @@
             if (is_master) write(*,*) "Paleo eccpal=",eccpal,"  tpal=",tpalnew
 
+            ! create restartfi
+            if (ngrid.ne.1) then
+               print*, "physdem1pal not yet implemented"
+               stop
+               !TODO: import this routine from pluto.old
+               ! call physdem1pal("restartfi.nc",long,lati,nsoilmx,nq, &
+               !      ptimestep,pdaypal, &
+               !      ztime_restart,tsurf,tsoil,emis,q2,qsurfpal, &
+               !      cell_area,albedodat,therm_inertia,zmea,zstd,zsig, &
+               !      zgam,zthe,oblipal,eccpal,tpalnew,adjustnew,phisfipal,  &
+               !      peri_daypal)
+            endif
+         else ! 'paleo'
+
+
+         endif ! end of 'paleo'
+      endif ! end of 'lastcall'
+
+      if(mod(icount,diagfi_output_rate).eq.0) then
+         write_restartfi = .true.
+      endif
 !----------------------------------------------------------------------
 !        Writing NetCDF file  "RESTARTFI" at the end of the run
@@ -2081 +2096 @@
 !              thus we store for time=time+dtvr
 
-            ! create restartfi
-            if (ngrid.ne.1) then
-               print*, "physdem1pal not yet implemented"
-               stop
-               !TODO: import this routine from pluto.old
-               ! call physdem1pal("restartfi.nc",long,lati,nsoilmx,nq, &
-               !      ptimestep,pdaypal, &
-               !      ztime_fin,tsurf,tsoil,emis,q2,qsurfpal, &
-               !      cell_area,albedodat,therm_inertia,zmea,zstd,zsig, &
-               !      zgam,zthe,oblipal,eccpal,tpalnew,adjustnew,phisfipal,  &
-               !      peri_daypal)
-            endif
-         else ! 'paleo'
-
-            if (ngrid.ne.1) then
-               write(*,*)'PHYSIQ: for physdem ztime_fin =',ztime_fin
-
-               call physdem1("restartfi.nc",nsoilmx,ngrid,nlayer,nq, &
-                           ptimestep,ztime_fin,tsurf,                &
-                           tsoil,therm_inertia,emis,albedo,q2,qsurf)
-            endif
-
-         endif ! end of 'paleo'
-      endif ! end of 'lastcall'
+      if (is_omp_master.and.write_restartfi) then
+         if (ngrid.ne.1) then
+            IF (grid_type==unstructured) THEN !IF DYNAMICO
+               ! DYNAMICO: no need to add a dynamics time step to ztime_restart
+               ztime_restart = ptime
+            ELSE ! LMDZ
+               ztime_restart = ptime + (ptimestep/daysec)
+            ENDIF ! of IF (grid_type==unstructured)
+
+            write(*,*)'PHYSIQ: writing restartfi at time =',ztime_restart
+
+            call physdem1("restartfi.nc",nsoilmx,ngrid,nlayer,nq, &
+                        ptimestep,ztime_restart,tsurf,                &
+                        tsoil,therm_inertia,emis,albedo,q2,qsurf)
+         endif ! ngrid
+      endif ! is_omp_master
+
+
 
 !------------------------------------------------------------------------------