Changeset 3183 for trunk/LMDZ.MARS/libf/dynphy_lonlat/phymars

Timestamp:

Jan 25, 2024, 6:06:27 PM (11 months ago)

Author:

jbclement

Message:

Mars PCM:
Some changes to prepare the introduction of slopes in 1D: in particular, the subroutine "getslopes.F90" and "param_slope.F90" are now inside the module "slope_mod.F90" + Few small cleanings throughout the code.
JBC

File:

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

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

@@ -1734 +1734 @@
 
         else if (trim(modif) .eq. 'nslope') then
-          write(*,*) 'set a new number of subgrid scale slope'
+          write(*,*) 'set a new number of subgrid scale slopes'
           write(*,*) 'Current value=', nslope
           write(*,*) 'Enter value for nslope (ex: 1,5,7)?'
@@ -1758 +1758 @@
 
       allocate(default_def_slope(nslope_new+1))
-      !Sub-grid scale  subslopes
-      if (nslope_new.eq.7) then
-      default_def_slope(1) = -43.
-      default_def_slope(2) = -19.
-      default_def_slope(3) = -9.
-      default_def_slope(4) = -3.
-      default_def_slope(5) = 3.
-      default_def_slope(6) = 9.
-      default_def_slope(7) = 19.
-      default_def_slope(8) = 43.
-      elseif (nslope_new.eq.5) then
-      default_def_slope(1) = -43.
-      default_def_slope(2) = -9.
-      default_def_slope(3) = -3.
-      default_def_slope(4) = 3.
-      default_def_slope(5) = 9.
-      default_def_slope(6) = 43.
-      elseif (nslope_new.eq.1) then
-      default_def_slope(1) = -50.
-      default_def_slope(2) = 50.
-      endif
+      ! Sub-grid scale slopes parameters (minimum/maximun angles)
+      select case(nslope)
+          case(1)
+              default_def_slope(1) = -50.
+              default_def_slope(2) = 50.
+          case(5)
+              default_def_slope(1) = -43.
+              default_def_slope(2) = -9.
+              default_def_slope(3) = -3.
+              default_def_slope(4) = 3.
+              default_def_slope(5) = 9.
+              default_def_slope(6) = 43.
+          case(7)
+              default_def_slope(1) = -43.
+              default_def_slope(2) = -19.
+              default_def_slope(3) = -9.
+              default_def_slope(4) = -3.
+              default_def_slope(5) = 3.
+              default_def_slope(6) = 9.
+              default_def_slope(7) = 19.
+              default_def_slope(8) = 43.
+          case default
+              write(*,*) 'Number of slopes not possible: nslope should 
+     & be 1, 5 or 7!'
+              call abort
+      end select
 
       do islope=1,nslope_new+1
@@ -1785 +1790 @@
 
       do islope=1,nslope_new
-       def_slope_mean(islope) =(def_slope(islope)+def_slope(islope+1))/2.
+       def_slope_mean(islope)=(def_slope(islope)+def_slope(islope+1))/2.
       enddo
 
@@ -1798 +1803 @@
        call subslope_mola(ngridmx,nslope_new,def_slope,subslope_dist)
 
-! Surfdat related stuff
-        
+! Surfdat related stuff 
         allocate(tsurf_old_slope(ngridmx,nslope_old))  
         allocate(qsurf_old_slope(ngridmx,nqtot,nslope_old))  
@@ -1805 +1809 @@
         allocate(watercap_old_slope(ngridmx,nslope_old)) 
         allocate(perennial_co2_old_slope(ngridmx,nslope_old)) 
-
 
         tsurf_old_slope(:,:)=tsurf(:,:)
@@ -1816 +1819 @@
 
 ! Comsoil related stuff (tsoil)
-
         allocate(tsoil_old_slope(ngridmx,nsoilmx,nslope_old))
         allocate(inertiesoil_old_slope(ngridmx,nsoilmx,nslope_old))
@@ -1829 +1831 @@
 
 ! Dimradmars related stuff (albedo)
-
         allocate(albedo_old_slope(ngridmx,2,nslope_old))
         albedo_old_slope(:,:,:)=albedo(:,:,:)