Changeset 2952 for trunk/LMDZ.MARS

Timestamp:

Apr 28, 2023, 2:28:08 PM (19 months ago)

Author:

romain.vande

Message:

Mars PCM + newstart + start_archive: Correct writing of variables inertiesoil and fluxgeo following r2919 and r2942
RV

Location:

trunk/LMDZ.MARS/libf

Files:

• dynphy_lonlat/phymars/newstart.F (modified) (8 diffs)
• dynphy_lonlat/phymars/write_archive.F (modified) (1 diff)
• phymars/comsoil_h.F90 (modified) (2 diffs)
• phymars/iostart.F90 (modified) (3 diffs)

trunk/LMDZ.MARS/libf/dynphy_lonlat/phymars/newstart.F

@@ -32 +32 @@
      &               ini_surfdat_h_slope_var,end_surfdat_h_slope_var
       use comsoil_h, only: inertiedat, inertiesoil,layer, mlayer,
-     & nsoilmx, tsoil,ini_comsoil_h_slope_var, end_comsoil_h_slope_var
+     & nsoilmx,tsoil,ini_comsoil_h_slope_var, end_comsoil_h_slope_var,
+     & flux_geo
       use control_mod, only: day_step, iphysiq, anneeref, planet_type
       use geometry_mod, only: longitude,latitude,cell_area
@@ -196 +197 @@
       REAL,ALLOCATABLE :: watercap_old_slope(:,:) ! Surface water ice (kg.m-2)
       REAL,ALLOCATABLE :: tsoil_old_slope(:,:,:) 
+      REAL,ALLOCATABLE :: inertiesoil_old_slope(:,:,:) 
       REAL,ALLOCATABLE :: albedo_old_slope(:,:,:) ! Surface albedo in each solar band
+      REAL,ALLOCATABLE :: flux_geo_old_slope(:,:)
       integer :: iflat
       integer :: nslope_old, nslope_new
@@ -1798 +1801 @@
         allocate(watercap_old_slope(ngridmx,nslope_old)) 
 
+
         tsurf_old_slope(:,:)=tsurf(:,:)
         qsurf_old_slope(:,:,:)=qsurf(:,:,:)
@@ -1809 +1813 @@
 
         allocate(tsoil_old_slope(ngridmx,nsoilmx,nslope_old))
-
+        allocate(inertiesoil_old_slope(ngridmx,nsoilmx,nslope_old))
+        allocate(flux_geo_old_slope(ngridmx,nslope_old))
+
+        inertiesoil_old_slope(:,:,:)=inertiesoil(:,:,:)
         tsoil_old_slope(:,:,:)=tsoil(:,:,:)
+        flux_geo_old_slope(:,:)=flux_geo(:,:)
 
         call end_comsoil_h_slope_var
@@ -1831 +1839 @@
              tsoil(:,:,islope)=tsoil_old_slope(:,:,1)
              albedo(:,:,islope)=albedo_old_slope(:,:,1)
+             inertiesoil(:,:,islope)=inertiesoil_old_slope(:,:,1)
+             flux_geo(:,islope)=flux_geo_old_slope(:,1)
           enddo
         elseif(nslope_new.eq.1) then
@@ -1839 +1849 @@
              tsoil(:,:,1)=tsoil_old_slope(:,:,iflat)
              albedo(:,:,1)=albedo_old_slope(:,:,iflat)
+             inertiesoil(:,:,1)=inertiesoil_old_slope(:,:,iflat)
+             flux_geo(:,1)=flux_geo_old_slope(:,iflat)
         elseif(nslope_old.eq.5 .and. nslope_new.eq.7) then
           do islope=1,nslope_new
@@ -1847 +1859 @@
              tsoil(:,:,islope)=tsoil_old_slope(:,:,iflat)
              albedo(:,:,islope)=albedo_old_slope(:,:,iflat)
+             inertiesoil(:,:,islope)=inertiesoil_old_slope(:,:,iflat)
+             flux_geo(:,islope)=flux_geo_old_slope(:,iflat)
           enddo
         elseif(nslope_old.eq.7 .and. nslope_new.eq.5) then
@@ -1856 +1870 @@
              tsoil(:,:,islope)=tsoil_old_slope(:,:,iflat)
              albedo(:,:,islope)=albedo_old_slope(:,:,iflat)
+             inertiesoil(:,:,islope)=inertiesoil_old_slope(:,:,iflat)
+             flux_geo(:,islope)=flux_geo_old_slope(:,iflat)
           enddo
         else

trunk/LMDZ.MARS/libf/dynphy_lonlat/phymars/write_archive.F

@@ -126 +126 @@
         ierr=NF_INQ_VARID(nid,nom,varid)
 
-        if(nom.eq."tsoil") then
+        if(nom.eq."tsoil" .or. nom.eq."inertiesoil") then
 
          if (ierr.ne.NF_NOERR) then ! variable not defined yet

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

@@ -84 +84 @@
     allocate(alph(ngrid,nsoilmx-1,nslope))
     allocate(beta(ngrid,nsoilmx-1,nslope))
+    allocate(flux_geo(ngrid,nslope))
  
   end subroutine ini_comsoil_h_slope_var
@@ -99 +100 @@
     if (allocated(alph)) deallocate(alph)
     if (allocated(beta)) deallocate(beta)
+    if (allocated(flux_geo)) deallocate(flux_geo)
 
   end subroutine end_comsoil_h_slope_var

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

@@ -836 +836 @@
             ierr=NF90_REDEF(nid_restart)
 #ifdef NC_DOUBLE
-            if(field_name.eq. "tsoil") then
+            if(field_name.eq. "tsoil".or. field_name.eq. "inertiesoil") then
             ierr=NF90_DEF_VAR(nid_restart,field_name,NF90_DOUBLE,&
                               (/idim2,idim3,idim8,idim7/),nvarid)
@@ -844 +844 @@
             endif
 #else
-            if(field_name.eq. "tsoil") then
+            if(field_name.eq. "tsoil".or. field_name.eq. "inertiesoil") then
             ierr=NF90_DEF_VAR(nid_restart,field_name,NF90_FLOAT,&
                               (/idim2,idim3,idim8,idim7/),nvarid)
@@ -1015 +1015 @@
           IF (LEN_TRIM(title) > 0) ierr=NF90_PUT_ATT(nid_restart,nvarid,"title",title)
           ierr=NF90_ENDDEF(nid_restart)
-          
           firsttime=.false.
           if(first_time1d) first_time1d=.false.