Changeset 3696 for trunk

Timestamp:

Mar 20, 2025, 9:02:16 AM (3 months ago)

Author:

emillour

Message:

Generic PCM:
Bug fix in the computation of rho() in calc_rayleigh
Made calc_rayleigh.F90 a module and commented out some prints
which swamped the standard output.
GM+EM

Location:

trunk/LMDZ.GENERIC

Files:

• changelog.txt (modified) (1 diff)
• libf/phystd/calc_rayleigh.F90 (modified) (6 diffs)
• libf/phystd/optcv.F90 (modified) (1 diff)

trunk/LMDZ.GENERIC/changelog.txt

@@ -2040 +2040 @@
 why saved variables are not threadprivate, get rid of useless "return"
 statement at the end of routines, etc.
+
+== 20/03/2025 == GM+EM
+Bug fix in the computation of rho() in calc_rayleigh
+Made calc_rayleigh.F90 a module and commented out some prints
+which swamped the standard output.

trunk/LMDZ.GENERIC/libf/phystd/calc_rayleigh.F90

@@ +1 @@
+module calc_rayleigh_mod
+
+implicit none
+
+contains
+
       subroutine calc_rayleigh(qvar,muvar,PMID,TMID,tauray)
 
@@ -67 +73 @@
       character(len=10),parameter :: subname="rayleigh"
       logical, save :: firstcall=.true.
-      
+!$OMP THREADPRIVATE(firstcall)      
+
       integer icantbewrong
 
@@ -111 +118 @@
          ! Convert qvar mol/mol -> kg/kg
          if((igas.eq.vgas).and.(maxval(QVAR(:)).ge.1.e-2))then
-            print*,'variable gas is ',trim(gnom(igas)),' in Rayleigh scattering '
+           ! print*,'variable gas is ',trim(gnom(igas)),' in Rayleigh scattering '
             mass_frac(igas,:) = QVAR(:)*massmol(igas)/muvar(:)
          elseif((igas/=vgas).and.(gfrac(igas).ge.1.e-2))then
             mass_frac(igas,:) = gfrac(igas)*(1.-QVAR(:))*massmol(igas)/muvar(:)
          else 
-            print*,'Ignoring ',trim(gnom(igas)),' in Rayleigh scattering '// &
-            'as its mixing ratio is less than 0.01.' 
+           ! print*,'Ignoring ',trim(gnom(igas)),' in Rayleigh scattering '// &
+           ! 'as its mixing ratio is less than 0.01.' 
             ! ignore variable gas in Rayleigh calculation
             ! ignore gases of mixing ratio < 0.01 in Rayleigh calculation
@@ -125 +132 @@
       enddo
       
-      ! ATTENTION, au delà de 60000 cm-1, pour toutes les molécules, il y a des singularités en lien avec la formule d'interpolation.
+      ! WARNING, beyond 60000 cm-1, for all molecules, there are singularities due to the interpolation formula.
       
    
@@ -188 +195 @@
                      P0(:) = pmid(:)*scalep
                      lr = 0.589
-                     rho(:) = mass_frac(igas,:)*muvar(:)/massmol(igas)*P0(:)/(8.314463*T0(:)/muvar(:)/1000.)
+                     rho(:) = mass_frac(igas,:)*muvar(:)/massmol(igas)*P0(:)/(8.314463*T0(:)/(muvar(:)/1000.))
                      rhos(:) = rho(:)/rhor
                      ts(:) = T0(:)/Tr
@@ -281 +288 @@
 
    end subroutine calc_rayleigh
+
+end module calc_rayleigh_mod

trunk/LMDZ.GENERIC/libf/phystd/optcv.F90

@@ -19 +19 @@
   use tpindex_mod, only: tpindex
   use interpolate_continuum_mod, only: interpolate_continuum
+  use calc_rayleigh_mod, only: calc_rayleigh
 
   implicit none