Changeset 2428 for trunk

Timestamp:

Nov 3, 2020, 5:22:38 PM (4 years ago)

Author:

emillour

Message:

Generci GCM:
Bug fix on mass_redistribution; argument rnat should be real, not integer.
Turned it into a mass_redistribution_mod module.
EM + YJ

Location:

trunk/LMDZ.GENERIC

Files:

• README (modified) (1 diff)
• libf/phystd/mass_redistribution_mod.F90 (moved) (moved from trunk/LMDZ.GENERIC/libf/phystd/mass_redistribution.F90) (5 diffs)
• libf/phystd/physiq_mod.F90 (modified) (1 diff)

trunk/LMDZ.GENERIC/README

@@ -1602 +1602 @@
 In the process turned vdifc into a module, as well as turbdiff,
 for better control, and removed unused arguments.
+
+== 03/11/2020 == EM + YJ
+Bug fix on mass_redistribution; argument rnat should be real, not integer.
+Turned it into a mass_redistribution_mod module.

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

@@ +1 @@
+MODULE mass_redistribution_mod
+
+CONTAINS
+
 SUBROUTINE mass_redistribution(ngrid,nlayer,nq,ptimestep,   &
                        rnat,pcapcal,pplay,pplev,pt,ptsrf,pq,pqs,     &
@@ -5 +9 @@
                                                    
        USE watercommon_h, Only: Tsat_water,RLVTT
-       use surfdat_h
        use radcommon_h, only: glat
-       USE tracer_h
+       USE tracer_h, ONLY: igcm_h2o_vap
        USE planete_mod, only: bp
        use comcstfi_mod, only: g
@@ -55 +58 @@
 !    Arguments :
 !    ---------
-      INTEGER ngrid, nlayer, nq   
-      REAL ptimestep
-      REAL pcapcal(ngrid)
-      INTEGER rnat(ngrid)      
-      REAL pplay(ngrid,nlayer),pplev(ngrid,nlayer+1)
-      REAL pt(ngrid,nlayer),pdt(ngrid,nlayer)
-      REAL ptsrf(ngrid),pdtsrf(ngrid)
-      REAL pdtmr(ngrid,nlayer)
-      REAL pu(ngrid,nlayer) ,  pv(ngrid,nlayer)
-      REAL pdu(ngrid,nlayer) , pdv(ngrid,nlayer)
-      REAL pdmassmr(ngrid,nlayer)
-      REAL pdumr(ngrid,nlayer) , pdvmr(ngrid,nlayer)
-      REAL pq(ngrid,nlayer,nq),pdq(ngrid,nlayer,nq)
-      REAL pqs(ngrid,nq)
-      REAL pdqmr(ngrid,nlayer,nq),pdqsmr(ngrid,nq)
-      REAL pdpsrfmr(ngrid),pdtsrfmr(ngrid)
+      INTEGER,INTENT(IN) :: ngrid, nlayer, nq   
+      REAL,INTENT(IN) :: ptimestep
+      REAL,INTENT(IN) :: pcapcal(ngrid)
+      REAL,INTENT(IN) :: rnat(ngrid)      
+      REAL,INTENT(IN) :: pplay(ngrid,nlayer),pplev(ngrid,nlayer+1)
+      REAL,INTENT(IN) :: pt(ngrid,nlayer),pdt(ngrid,nlayer)
+      REAL,INTENT(IN) :: ptsrf(ngrid),pdtsrf(ngrid)
+      REAL,INTENT(OUT) :: pdtmr(ngrid,nlayer)
+      REAL,INTENT(IN) :: pu(ngrid,nlayer) ,  pv(ngrid,nlayer)
+      REAL,INTENT(IN) :: pdu(ngrid,nlayer) , pdv(ngrid,nlayer)
+      REAL,INTENT(IN) :: pdmassmr(ngrid,nlayer)
+      REAL,INTENT(OUT) :: pdumr(ngrid,nlayer) , pdvmr(ngrid,nlayer)
+      REAL,INTENT(IN) :: pq(ngrid,nlayer,nq),pdq(ngrid,nlayer,nq)
+      REAL,INTENT(IN) :: pqs(ngrid,nq)
+      REAL,INTENT(OUT) :: pdqmr(ngrid,nlayer,nq),pdqsmr(ngrid,nq)
+      REAL,INTENT(OUT) :: pdpsrfmr(ngrid),pdtsrfmr(ngrid)
 !
 !    Local variables :
@@ -143 +146 @@
             if (ztsrf(ig).gt.Tsat(ig)) then
                zmassboil(ig)=(ptsrf(ig)-Tsat(ig))*pcapcal(ig)/RLVTT/ptimestep
-               if ((zmassboil(ig)*ptimestep.gt.pqs(ig,igcm_h2o_vap)).and.(rnat(ig).eq.1)) then
+               if ((zmassboil(ig)*ptimestep.gt.pqs(ig,igcm_h2o_vap)).and.(nint(rnat(ig)).eq.1)) then
                   zmassboil(ig)=pqs(ig,igcm_h2o_vap)/ptimestep
                endif
@@ -407 +410 @@
 
 END SUBROUTINE mass_redistribution
+
+END MODULE mass_redistribution_mod

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

@@ -55 +55 @@
       use turbdiff_mod, only: turbdiff
       use turb_mod, only : q2,sensibFlux,turb_resolved
+      use mass_redistribution_mod, only: mass_redistribution
 #ifndef MESOSCALE
       use vertical_layers_mod, only: presnivs, pseudoalt