Changeset 4179

Timestamp:

Apr 10, 2026, 5:31:47 PM (101 minutes ago)

Author:

emillour

Message:

Generic PCM:
Clean up code: put inter_line.F in a module util_linear_interpolation.F90 and
also turn soil.F and soil_settings.F into modules.
EM

Location:

trunk/LMDZ.GENERIC

Files:

• changelog.txt (modified) (1 diff)
• libf/dynphy_lonlat/phygeneric/lect_start_archive.F (modified) (1 diff)
• libf/phygeneric/phyetat0_mod.F90 (modified) (1 diff)
• libf/phygeneric/physiq_mod.F90 (modified) (1 diff)
• libf/phygeneric/soil.F (modified) (2 diffs)
• libf/phygeneric/soil_settings.F (modified) (2 diffs)
• libf/phygeneric/util_linear_interpolation.F90 (moved) (moved from trunk/LMDZ.GENERIC/libf/phygeneric/interp_line.F) (3 diffs)

trunk/LMDZ.GENERIC/changelog.txt

@@ -2268 +2268 @@
 == 10/04/2026 == EM
 Code cleanup: remove unused surface_nature.F and scopyi.F
+
+== 10/04/2026 == EM
+Clean up code: put inter_line.F in a module util_linear_interpolation.F90 and
+also turn soil.F and soil_settings.F into modules.

trunk/LMDZ.GENERIC/libf/dynphy_lonlat/phygeneric/lect_start_archive.F

@@ -14 +14 @@
       USE comvert_mod, ONLY: ap,bp,aps,bps,preff
       USE comconst_mod, ONLY: kappa,g,pi
+      USE util_linear_interpolation_mod, ONLY: interp_line
 
 c=======================================================================

trunk/LMDZ.GENERIC/libf/phygeneric/phyetat0_mod.F90

@@ -32 +32 @@
   USE ocean_slab_mod, ONLY: nslay
   use callkeys_mod, only: CLFvarying,surfalbedo,surfemis, callsoil
+  use soil_settings_mod, only: soil_settings
   use nonoro_gwd_ran_mod, only: du_nonoro_gwd, dv_nonoro_gwd, &
                                 east_gwstress, west_gwstress

trunk/LMDZ.GENERIC/libf/phygeneric/physiq_mod.F90

@@ -35 +35 @@
       use comsaison_h, only: mu0, fract, dist_star, declin, right_ascen
       use comsoil_h, only: nsoilmx, layer, mlayer, inertiedat
+      use soil_mod, only: soil
       use geometry_mod, only: latitude, longitude, cell_area, &
                           cell_area_for_lonlat_outputs

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

@@ +1 @@
+      module soil_mod
+      
+      implicit none
+      
+      contains
+      
       subroutine soil(ngrid,nsoil,firstcall,lastcall,
      &          therm_i,
@@ -222 +228 @@
       enddo
 
-      end
-
+      end subroutine soil
+
+      end module soil_mod

trunk/LMDZ.GENERIC/libf/phygeneric/soil_settings.F

@@ +1 @@
+      module soil_settings_mod
+      
+      implicit none
+      
+      contains
+      
       subroutine soil_settings(nid,ngrid,nsoil,tsurf,tsoil,indextime)
 
-!      use netcdf
       use comsoil_h, only: layer, mlayer, inertiedat, volcapa,
      &                     lay1_soil, alpha_soil
+      use util_linear_interpolation_mod, only: interp_line
       use iostart, only: inquire_field_ndims, get_var, get_field,
      &                   inquire_field, inquire_dimension_length
@@ -364 +370 @@
       xmax = MAXVAL(tsoil)
       write(*,*)'Soil temperature <tsoil>:',xmin,xmax
-      end
+      
+      end subroutine soil_settings
+      
+      end module soil_settings_mod

trunk/LMDZ.GENERIC/libf/phygeneric/util_linear_interpolation.F90

@@ -1 @@
-      subroutine interp_line(x1,y1,len1,x2,y2,len2)
+module util_linear_interpolation_mod
+
+implicit none
+
+contains
+
+    subroutine interp_line(x1,y1,len1,x2,y2,len2)
       implicit none
 !-----------------------------------------------------------------------
@@ -10 +16 @@
 !  the nearby x1(:) point
 !  
-c-----------------------------------------------------------------------
+!-----------------------------------------------------------------------
 !  arguments
 !  ---------
 !  inputs:
-      real x1(len1) ! ordered list of abscissas
-      real y1(len1) ! values at x1(:)
-      integer len1  ! length of x1(:) and y1(:)
-      real x2(len2) !ordered list of abscissas at which interpolation is done
-      integer len2  ! length of x2(:) and y2(:)
+      real,intent(in) :: x1(len1) ! ordered list of abscissas
+      real,intent(in) :: y1(len1) ! values at x1(:)
+      integer,intent(in) :: len1  ! length of x1(:) and y1(:)
+      real,intent(in) :: x2(len2) ! ordered list of abscissas at which interpolation is done
+      integer,intent(in) :: len2  ! length of x2(:) and y2(:)
 !  outputs:
-      real y2(len2) ! interpolated values
+      real,intent(out) :: y2(len2) ! interpolated values
 !-----------------------------------------------------------------------
 
 ! local variables:
-      integer i,j
+      integer :: i,j
       
 
       do i=1,len2
         ! check if x2(i) lies outside of the interval covered by x1()
-        if(((x2(i).le.x1(1)).and.(x2(i).le.x1(len1))).or.
-     &     ((x2(i).ge.x1(1)).and.(x2(i).ge.x1(len1)))) then
+        if(((x2(i).le.x1(1)).and.(x2(i).le.x1(len1))).or. &
+           ((x2(i).ge.x1(1)).and.(x2(i).ge.x1(len1)))) then
           ! set y2(i) to y1(1) or y1(len1)
           if (abs(x2(i)-x1(1)).lt.abs(x2(i)-x1(len1))) then
@@ -43 +49 @@
         ! find the nearest neigbours and do a linear interpolation
          do j=1,len1-1
-          if(((x2(i).ge.x1(j)).and.(x2(i).le.x1(j+1))).or.
-     &       ((x2(i).le.x1(j)).and.(x2(i).ge.x1(j+1)))) then
-            y2(i)=((x2(i)-x1(j))/(x1(j+1)-x1(j)))*y1(j+1)+
-     &            ((x2(i)-x1(j+1))/(x1(j)-x1(j+1)))*y1(j)
+          if(((x2(i).ge.x1(j)).and.(x2(i).le.x1(j+1))).or. &
+             ((x2(i).le.x1(j)).and.(x2(i).ge.x1(j+1)))) then
+            y2(i)=((x2(i)-x1(j))/(x1(j+1)-x1(j)))*y1(j+1)+ &
+                  ((x2(i)-x1(j+1))/(x1(j)-x1(j+1)))*y1(j)
           endif
          enddo
         endif
 
-      enddo
+      enddo ! of do i=1,len2
 
-      end
+    end subroutine interp_line
+
+end module util_linear_interpolation_mod