Changeset 3303 for trunk

Timestamp:

Apr 16, 2024, 1:59:23 PM (7 months ago)

Author:

jbclement

Message:

Mars PCM:
Revert "subslope_mola.F90" to the version before r3301. The modification was a mistake.
JBC

Location:

trunk/LMDZ.MARS

Files:

• changelog.txt (modified) (1 diff)
• libf/dynphy_lonlat/phymars/subslope_mola.F90 (modified) (6 diffs)

trunk/LMDZ.MARS/changelog.txt

@@ -4605 +4605 @@
 == 15/04/2024 == JBC
 Correction related to r3301: the variable 'resol' was not linked to longitude resolution.
+
+== 16/04/2024 == JBC
+Revert "subslope_mola.F90" to the version before r3301. The modification was a mistake.

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

@@ -60 +60 @@
 !-------------Building of theta_mola and psi_mola 
       ! Assume that the mola file is to ben found in "datadir"
-      CALL mola(trim(datadir)//"/",iim, &
+      CALL mola(trim(datadir)//"/",&
                 ierr,theta_mola,psi_mola,resol,iim_mola,jjm_mola)
 
@@ -111 +111 @@
 !==========================================================================================
 
- SUBROUTINE mola(dset,iim,ierr,theta_mola,psi_mola,resol,iim_mola,jjm_mola)
+ SUBROUTINE mola(dset,ierr,theta_mola,psi_mola,resol,iim_mola,jjm_mola)
 
 
@@ -124 +124 @@
 logical output_messages
       parameter (output_messages=.true.)
-      double precision resol ! MOLA pixel/degree resolution
-      integer jjm_mola, iim_mola ! # of longitude and latitude MOLA data values 
+      double precision resol
+!c      parameter(resol=16) ! MOLA pixel/degree resolution
+
+
+      integer jjm_mola, iim_mola   ! # of longitude and latitude MOLA data values 
 
 ! Arguments
 ! inputs
       character*(*) dset ! Path to MCD datafiles 
-      integer :: iim
 
 ! outputs
@@ -141 +143 @@
 
 ! Local variables
+
       real latitude  ! north latitude (degrees)m
       real longitude ! east longitude (degrees)
-      character*140 molafile ! MOLA datafile
+      character*140 molafile ! MOLA datafile 
+!      data molafile/'mola_32.2.nc'/
+!c      data molafile/'mola16.nc'/
+!c      data molafile/'mola32.nc'/
 !c      real invresol
 !c      parameter(invresol=1./resol)
@@ -162 +168 @@
       double precision lat,lon ! longitude and latitude, local values (in degrees)
       real topogrid(iim_mola,jjm_mola) ! altmola in 'real' version
-      character(2) :: iim_char
 
 
 !C 1.1. Open MOLA file
-         write(iim_char,'(i2)') iim
-         molafile = dset//'mola'//iim_char//'.nc'
+         molafile=dset//'mola64.nc'
          if (output_messages) then
            write(*,*)"Loading MOLA topography from file ", &
@@ -574 +578 @@
 
 END MODULE subslope_mola_mod
+