Changeset 2910 for trunk/LMDZ.MARS

Timestamp:

Mar 10, 2023, 6:05:41 PM (21 months ago)

Author:

emillour

Message:

Mars PCM:
Make subslope_mola a module and turn (extremely) large static arrays into
allocated ones and assume that the "mola64.nc" file is in "datadir" rather
than a hard coded location.
EM

Location:

trunk/LMDZ.MARS

Files:

• README (modified) (1 diff)
• libf/dynphy_lonlat/phymars/newstart.F (modified) (1 diff)
• libf/dynphy_lonlat/phymars/subslope_mola.F90 (modified) (11 diffs)

trunk/LMDZ.MARS/README

@@ -3931 +3931 @@
 It can create start with 1, 5 or 7 subslope abd needs mola64.nc to do so.
 Correction in compute_mesh_avg for nslope=1: no average is done only a copy.
+
+== 10/03/2023 == EM
+Make subslope_mola a module and turn (extremely) large static arrays into
+allocated ones and assume that the "mola64.nc" file is in "datadir" rather
+than a hard coded location.

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

@@ -55 +55 @@
       use comslope_mod, ONLY: nslope,def_slope,def_slope_mean,
      &             subslope_dist,end_comslope_h,ini_comslope_h
+      USE subslope_mola_mod, ONLY: subslope_mola
+      
       implicit none
 

trunk/LMDZ.MARS/libf/dynphy_lonlat/phymars/subslope_mola.F90

@@ +1 @@
+MODULE subslope_mola_mod
+
+IMPLICIT NONE
+
+CONTAINS
+
 SUBROUTINE subslope_mola(ngridmx,nslope,def_slope,subslope_dist)
 
@@ -6 +12 @@
                                  north_east, north_west, &
                                  south_west, south_east
+USE datafile_mod, ONLY: datadir
 
 IMPLICIT NONE
@@ -15 +22 @@
       integer :: jjm_mola, iim_mola 
       parameter(jjm_mola=180*resol, iim_mola=2*jjm_mola)
-      character*(*) dset ! Path to MCD datafiles 
-      parameter(dset ='/ccc/scratch/cont003/gen10391/vandemer/test_pem2_watercap/datadir/')
       integer :: ierr 
 ! returned status code (==0 if OK)
-      real :: theta_mola(iim_mola,jjm_mola) 
+      real,allocatable :: theta_mola(:,:) !theta_mola(iim_mola,jjm_mola) 
 !ED18 : slopes inclination (see getslope.F90)
-      real :: psi_mola(iim_mola,jjm_mola) 
+      real,allocatable :: psi_mola(:,:) !psi_mola(iim_mola,jjm_mola) 
 !ED18 : slopes orientation (idem)     
       REAL :: lon1, lon2, lat1, lat2 !bounds of the square
@@ -39 +44 @@
       LOGICAL,PARAMETER :: rfz = .false.
       INTEGER,PARAMETER :: igps = 1000 !first ig for RFZ location
-
+      
+      ! allocate big arrays
+      allocate(theta_mola(iim_mola,jjm_mola),stat=ierr)
+      if (ierr/=0) then
+        write(*,*)"subslope_mola: allocation of theta_mola(:,:) failed!"
+        stop
+      endif
+      allocate(psi_mola(iim_mola,jjm_mola),stat=ierr)
+      if (ierr/=0) then
+        write(*,*)"subslope_mola: allocation of psi_mola(:,:) failed!"
+        stop
+      endif
+      
+  
 !-------------Building of theta_mola and psi_mola 
-      CALL mola(dset,ierr,theta_mola,psi_mola,resol,iim_mola,jjm_mola)
+      ! Assume that the mola file is to ben found in "datadir"
+      CALL mola(trim(datadir)//"/",&
+                ierr,theta_mola,psi_mola,resol,iim_mola,jjm_mola)
 
 !-------------Building of distribution
@@ -83 +103 @@
               max_crit,max_lon,max_lat
 
+     ! deallocate big arrays (this routine is only called once)
+     deallocate(theta_mola,psi_mola)
+     
 END SUBROUTINE subslope_mola
 
@@ -159 +182 @@
                        trim(molafile)
             endif
-            ierr=15 !set appropriate error code
-            return
+            stop
          endif
 
@@ -174 +196 @@
             write(*,*)"Error in mola: <alt> not found"
            endif
-           ierr=16 ! set appropriate error code
-           return
+           stop
          endif
 
@@ -364 +385 @@
       INTEGER :: i_lon1, i_lon2
       INTEGER :: j_lat1, j_lat2
-      REAL :: crit !function
+!      REAL :: crit !function
       REAL :: val_crit !intermediate for evaluating the criterium
       REAL :: max_crit !indicator for maximum slope criterium computed
@@ -531 +552 @@
 
 
-END SUBROUTINE slopes_stat
-
+      CONTAINS
 
 !***********************************************************************
@@ -543 +563 @@
 
       REAL crit
-      REAL theta, psi
+      REAL,INTENT(IN) :: theta, psi
       real, parameter :: pi = acos(-1.)
 
@@ -553 +573 @@
 
 
+END SUBROUTINE slopes_stat
+
+
+
+END MODULE subslope_mola_mod