Changeset 3739 for trunk/LMDZ.MARS/libf/phymars/tcondwater.F90

Timestamp:

Apr 26, 2025, 8:20:13 PM (7 weeks ago)

Author:

emillour

Message:

Mars PCM:
Code tidying: put routines in modules, remove useless "return" statements, etc.
EM

File:

• trunk/LMDZ.MARS/libf/phymars/tcondwater.F90 (modified) (3 diffs)

trunk/LMDZ.MARS/libf/phymars/tcondwater.F90

@@ -1 @@
-SUBROUTINE tcondwater(nbpts,p,q,tcond)
+module tcondwater_mod
+
+implicit none
+
+contains
+
+subroutine tcondwater(ngrid,nlay,p,q,tcond)
 IMPLICIT NONE 
 
@@ -7 +13 @@
 !--------------------------------------------------i
 
-integer, intent(in) :: nbpts
-real, intent(in), dimension(nbpts):: p,q
-real, intent(out), dimension(nbpts):: tcond
+integer, intent(in) :: ngrid, nlay
+real, intent(in) :: p(ngrid,nlay) ! pressure (Pa)
+real, intent(in) :: q(ngrid,nlay) ! water mass mixing ratio (kg/kg_air)
+real, intent(out):: tcond(ngrid,nlay) ! condensation temeprature (K)
 
-real, dimension(nbpts):: res
 real:: x
-integer:: i
-
-do i=1,nbpts
+integer:: i,j
+do i=1,ngrid
+ do j=1,nlay
    !write(*,*) "i en cours", i, "sur nbpts=", nbpts
    !write(*,*) "q(i)",q(i),"p(i)",p(i)
-   x=alog10(MAX(q(i),1e-16)*p(i)/(100.*0.41)) ! max pour erreur q<=0
+   x=alog10(MAX(q(i,j),1e-16)*p(i,j)/(100.*0.41)) ! max pour erreur q<=0
    ! attention change le 0.41 de place le 10 juin 2014 car priorites
    ! fortran dans watersat.F
@@ -26 +32 @@
    !        + 2.12411064e-04*x**6+1.64642075e-05*x**7+9.22615632e-07*x**8
    !        + 3.18958825e-08*x**9+5.00656720e-10*x**10 degre 10: trop!
-   res(i) = 2.52846556e+02+ 2.39229653e+01*x+ 2.21333897e+00*x**2  &
+   tcond(i,j) = 2.52846556e+02+ 2.39229653e+01*x+ 2.21333897e+00*x**2  &
                 + 1.79977992e-01*x**3+ 1.00068175e-02*x**4+2.55145012e-04*x**5
    !write(*,*) "rex(x) tcondwater AP14! :) :) :) :P", res(i)
+ enddo
 enddo
 
-tcond=res
+end subroutine tcondwater
 
-return 
-end
+end module tcondwater_mod
 !polynome de degre 5 pas 0.0001
 !polynomial coefs [  2.52846556e+02   2.39229653e+01   2.21333897e+00