Changeset 3485 for trunk/LMDZ.GENERIC

Timestamp:

Oct 24, 2024, 1:10:52 PM (4 weeks ago)

Author:

afalco

Message:

Generic PCM: abort_physic() in soil.F instead of stop().
AF

File:

• trunk/LMDZ.GENERIC/libf/phystd/soil.F (modified) (9 diffs)

trunk/LMDZ.GENERIC/libf/phystd/soil.F

@@ -16 +16 @@
 !
 !  Purpose: Compute soil temperature using an implict 1st order scheme
-!  
-!  Note: depths of layers and mid-layers, soil thermal inertia and 
+!
+!  Note: depths of layers and mid-layers, soil thermal inertia and
 !        heat capacity are commons in comsoil.h
 !-----------------------------------------------------------------------
@@ -25 +25 @@
 !  ---------
 !  inputs:
-      integer,intent(in) :: ngrid       ! number of (horizontal) grid-points 
-      integer,intent(in) :: nsoil       ! number of soil layers 
-      logical,intent(in) :: firstcall ! identifier for initialization call 
+      integer,intent(in) :: ngrid       ! number of (horizontal) grid-points
+      integer,intent(in) :: nsoil       ! number of soil layers
+      logical,intent(in) :: firstcall ! identifier for initialization call
       logical,intent(in) :: lastcall
       real,intent(in) :: therm_i(ngrid,nsoil) ! thermal inertia
@@ -46 +46 @@
       real,save :: mu
 !$OMP THREADPRIVATE(mthermdiff,thermdiff,coefq,coefd,alph,beta,mu)
-            
+
 ! local variables:
       integer ig,ik
@@ -56 +56 @@
       if (firstcall) then
       ! note: firstcall is set to .true. or .false. by the caller
-      !       and not changed by soil.F 
+      !       and not changed by soil.F
 
       ALLOCATE(mthermdiff(ngrid,0:nsoil-1)) ! mid-layer thermal diffusivity
@@ -100 +100 @@
           coefd(ig,ik)=thermdiff(ig,ik)/(mlayer(ik)-mlayer(ik-1))
         enddo
-        
+
         ! alph_{N-1}
         alph(ig,nsoil-1)=coefd(ig,nsoil-1)/
@@ -120 +120 @@
       !write(*,*)'soil: ig=',ig,' capcal(ig)=',capcal(ig)
       enddo ! of do ig=1,ngrid
-      
+
       ! Additional checks: is the vertical discretization sufficient
       ! to resolve diurnal and annual waves?
@@ -139 +139 @@
      &                diurnal_skin
           write(*,*) " change soil layer distribution (comsoil_h.F90)"
-          stop
+          call abort_physic("soil",
+     &          "change soil layer distribution (comsoil_h.F90)",1)
         endif
         if (2.*annual_skin>layer(nsoil)) then
@@ -150 +151 @@
      &                annual_skin
           write(*,*) " change soil layer distribution (comsoil_h.F90)"
-          stop
+          call abort_physic("soil",
+     &          "change soil layer distribution (comsoil_h.F90)",1)
         endif
       enddo ! of do ig=1,ngrid
-      
+
       else ! of if (firstcall)
 
@@ -171 +173 @@
         enddo
       enddo
-      
+
       endif! of if (firstcall)