Changeset 2926 for trunk/LMDZ.MARS/libf

Timestamp:

Mar 31, 2023, 11:48:38 AM (20 months ago)

Author:

romain.vande

Message:

1D Mars PCM:
Following r2924, the 1D model always output a restarfi
RV

Location:

trunk/LMDZ.MARS/libf/phymars

Files:

• dyn1d/testphys1d.F (modified) (3 diffs)
• iostart.F90 (modified) (4 diffs)
• physiq_mod.F (modified) (5 diffs)

trunk/LMDZ.MARS/libf/phymars/dyn1d/testphys1d.F

@@ -686 +686 @@
       
 
-
-
 ! Initialize soil properties and temperature
 ! ------------------------------------------
@@ -792 +790 @@
      &              tsurf,tsoil,albedo,emis,q2,qsurf,tauscaling,
      &              totcloudfrac,wstar,watercap)
-      else
-         CALL phyetat0 ("startfi.nc",0,0,
-     &         nsoilmx,ngrid,nlayer,nq,
-     &         day0,time,
-     &         tsurf,tsoil,albedo_read,emis,
-     &         q2,qsurf,tauscaling,totcloudfrac,wstar,
-     &         watercap,def_slope,def_slope_mean,subslope_dist)
-         day=real(day0)
-         albedo(1,1)=albedo_read(1,1,1)
       endif !(.not. startfile_1D )
 
@@ -950 +939 @@
         CALL endg1d(1,nlayer,zlay/1000.,ndt)
 
-c      if(startfile_1D) then
-c       call physdem0("restartfi.nc",longitude,latitude,nsoilmx,ngrid,
-c     &              llm,nq,dtphys,float(day0),0.,cell_area,
-c     &              albedodat,inertiedat,def_slope,subslope_dist)
-c       call physdem1("restartfi.nc",nsoilmx,ngrid,llm,nq,
-c     &              dtphys,time,
-c     &              tsurf,tsoil,albedo,emis,q2,qsurf,tauscaling,
-c     &              totcloudfrac,wstar,watercap)
-c      endif! startfile_1D
-
       write(*,*) "testphys1d: Everything is cool."
 

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

@@ -5 +5 @@
     INTEGER,SAVE :: nid_start ! NetCDF file identifier for startfi.nc file
     INTEGER,SAVE :: nid_restart ! NetCDF file identifier for restartfi.nc file
+    LOGICAL,SAVE :: first_time1d=.false.
     
     ! restartfi.nc file dimension identifiers: (see open_restartphy())
@@ -472 +473 @@
     INTEGER                     :: ierr
     LOGICAL,SAVE :: already_created=.false.
+    LOGICAL,SAVE :: already_created_restarfi_1d=.false.
+
+      if(klon_glo.eq.1 .and. filename.eq."restartfi.nc" .and. .not.already_created_restarfi_1d) then
+        already_created=.false.
+        already_created_restarfi_1d=.true.
+        first_time1d=.true.
+      endif
     
     IF (is_master) THEN
@@ -995 +1003 @@
       IF (var_name=="Time") THEN
         ! Very specific case of "Time" variable
-        if (firsttime) then
+        if (firsttime .or. first_time1d) then
           ! Create the "Time variable"
           ierr=NF90_REDEF(nid_restart)
@@ -1009 +1017 @@
           
           firsttime=.false.
+          if(first_time1d) first_time1d=.false.
         endif
         ! Append "time" value

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

@@ -545 +545 @@
 
       logical :: write_restart
-      logical,save :: startfile_1D
 
 c=======================================================================
@@ -749 +748 @@
 
 #ifndef MESOSCALE
-      startfile_1D=.false.
-      call getin("startfile_1D",startfile_1D)
-         if (ngrid.ne.1 .or. startfile_1D) then
+         if(ngrid.ne.1) then
            ! no need to compute slopes when in 1D; it is an input
-           if (callslope) call getslopes(ngrid,phisfi)
-           ! no need to create a restart file in 1d
+         if (callslope) call getslopes(ngrid,phisfi)
+         endif !1D
          if (ecritstart.GT.0) then
              call physdem0("restartfi.nc",longitude,latitude,
@@ -768 +765 @@
      &                   subslope_dist)
           endif
-         endif
 
 c        Initialize mountain mesh fraction for the entrainment by top flows param.
@@ -2551 +2547 @@
 c        ----------------------------------------------------------
 
-        IF (startfile_1D) THEN
-
 #ifndef MESOSCALE
 c        -------------------------------------------------------------------
@@ -2615 +2609 @@
 
 #endif
-
-         ENDIF ! startfile_1D
 
          IF (ngrid.NE.1) then