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

Timestamp:

Nov 2, 2023, 4:28:39 PM (14 months ago)

Author:

llange

Message:

MARS PCM
Fixing a bug in soil_settings: oldinertiesoil and oldtsoil were not
allocated if the variables were not in the startfi and an interpolation
was needed
LL

File:

• trunk/LMDZ.MARS/libf/phymars/soil_settings.F (modified) (7 diffs)

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

@@ -87 +87 @@
 ! -------------------
 
+
 ! 1.1 Start by reading how many layers of soil there are
 
@@ -146 +147 @@
          do iloop=0,nsoil-1
            mlayer(iloop)=lay1*(alpha**(iloop-0.5))
-         enddo
+         enddo
       endif
 
@@ -157 +158 @@
         layer(iloop)=lay1*(alpha**(iloop-1))
       enddo
+
+
 
 ! 2. Volumetric heat capacity (note: it is declared in comsoil_h)
@@ -241 +244 @@
         write(*,*)' => Building <inertiesoil> from surface values'//
      & ' <inertiedat>'
-        do islope=1,nslope
-                inertiesoil(:,:,islope)=inertiedat(:,:)
-        enddo
+! Case 1: No interpolation needed, we just copy past inertiedat
+        if(.not.(interpol)) then
+           do islope=1,nslope
+              inertiesoil(:,:,islope)=inertiedat(:,:)
+           enddo
+        else 
+! Case 2: Interpolation needed: we copy past old value from inertiedat
+           if (.not.allocated(oldinertiesoil)) then
+              allocate(oldinertiesoil(ngrid,dimlen,nslope),stat=ierr)
+           endif
+           do islope=1,nslope
+              oldinertiesoil(:,:,islope)=oldinertiedat(:,:)
+           enddo
+        endif
       else ! <inertiesoil> found
        if (interpol) then ! put values in oldinertiesoil
@@ -283 +297 @@
         write(*,*)'soil_settings: Field <tsoil> not found!'
         write(*,*)' => Building <tsoil> from surface values <tsurf>'
-        do iloop=1,nsoil
-          do islope=1,nslope
-            tsoil(:,iloop,islope)=tsurf(:,islope)
+! Case 1: No interpolation needed, we just copy past inertiedat
+        if(.not.(interpol)) then
+          do iloop=1,nsoil 
+            do islope=1,nslope
+              tsoil(:,iloop,islope)=tsurf(:,islope)
+            enddo
           enddo
-        enddo
+        else 
+! Case 2: Interpolation needed: we copy past old value from inertiedat
+          if (.not.allocated(oldtsoil)) then
+             allocate(oldtsoil(ngrid,dimlen,nslope),stat=ierr)
+          endif
+          do iloop=1,dimlen
+            do islope=1,nslope
+              oldtsoil(:,iloop,islope)=tsurf(:,islope)
+            enddo
+          enddo
+        endif
       else ! <tsoil> found
        if (interpol) then ! put values in oldtsoil
@@ -372 +399 @@
            enddo
         enddo ! ig
-
         
       ! soil temperature
@@ -391 +417 @@
         
         !cleanup
-         deallocate(oldgrid)
+          deallocate(oldgrid)
           deallocate(oldval)
           deallocate(newval)