Changeset 2226

Timestamp:

Jan 24, 2020, 3:55:19 PM (5 years ago)

Author:

emillour

Message:

Mars GCM:
Bug fix in rocketduststorm & topmons routines; "tauscaling" sould not be a local
(moreover uninitialized) variable. Added it to the arguments of the routines.
EM

Location:

trunk/LMDZ.MARS

Files:

• README (modified) (1 diff)
• libf/phymars/physiq_mod.F (modified) (2 diffs)
• libf/phymars/rocketduststorm_mod.F90 (modified) (4 diffs)
• libf/phymars/topmons_mod.F90 (modified) (7 diffs)

trunk/LMDZ.MARS/README

@@ -2842 +2842 @@
 Further cleanup of nonorographic gravity waves drag parametrization east_gwstress
 and west_gwstress need be initialized and are better as module variables.
+
+== 24/01/2020 == EM
+Bug fix in rocketduststorm & topmons routines; "tauscaling" sould not be a local
+(moreover uninitialized) variable. Added it to the arguments of the routines.

trunk/LMDZ.MARS/libf/phymars/physiq_mod.F

@@ -1063 +1063 @@
      &                      clearatm,icount,zday,zls,
      &                      tsurf,igout,totstormfract,
+     &                      tauscaling,
 c               input sub-grid scale cloud
      &                      clearsky,totcloudfrac,
@@ -1128 +1129 @@
      &                zzlay,zdtsw,zdtlw,
      &                icount,zday,zls,tsurf,igout,aerosol, 
-     &                totstormfract,clearatm,dsords,
+     &                tauscaling,totstormfract,clearatm,dsords,
      &                clearsky,totcloudfrac,
      &                nohmons,hsummit,

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

@@ -24 +24 @@
                                  clearatm,icount,zday,zls,             &
                                  tsurf,igout,totstormfract,            &
+                                 tauscaling,                           &
 !             input sub-grid scale cloud
                                  clearsky,totcloudfrac,                &
@@ -39 +40 @@
       USE comsaison_h, only: dist_sol,mu0,fract
       USE surfdat_h, only: emis,co2ice,zmea, zstd, zsig, hmons
-      USE callradite_mod
+      USE callradite_mod, only: callradite
       IMPLICIT NONE
 
@@ -75 +76 @@
       INTEGER, INTENT(IN) :: igout
       REAL, INTENT(IN) :: totstormfract(ngrid)
+      REAL, INTENT(INOUT) :: tauscaling(ngrid)
       
 !     sbgrid scale water ice clouds
@@ -160 +162 @@
       REAL  tau(ngrid,naerkind)
       REAL  aerosol(ngrid,nlayer,naerkind)
-      REAL  tauscaling(ngrid)
       REAL  taucloudtes(ngrid)
       REAL  rdust(ngrid,nlayer)

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

@@ -24 +24 @@
 !             input for radiative transfer
                                  icount,zday,zls,tsurf,igout,aerosol,  &
+                                 tauscaling,                           &
 !             input sub-grid scale rocket dust storm
                                  totstormfract,clearatm,dsords,        &
@@ -41 +42 @@
       USE comsaison_h, only: dist_sol,mu0,fract
       USE surfdat_h, only: emis,co2ice,hmons,summit
-      USE callradite_mod
+      USE callradite_mod, only: callradite
 
       IMPLICIT NONE
@@ -74 +75 @@
       REAL, INTENT(IN) :: tsurf(ngrid)
       INTEGER, INTENT(IN) :: igout
+      REAL, INTENT(INOUT) :: tauscaling(ngrid)
 !     input sub-grid scale rocket dust storm
       LOGICAL, INTENT(IN) :: clearatm
@@ -113 +115 @@
       REAL  fluxtop_sw1(ngrid,2)
       REAL  tau(ngrid,naerkind)
-      REAL  tauscaling(ngrid)
       REAL  taucloudtes(ngrid)
       REAL  rdust(ngrid,nlayer)
@@ -292 +293 @@
             zdtsw_lev(ig,1)=0.
             ztlev(ig,1)=zt(ig,1)
+            t_top_lev(ig,1)=tsurf(ig)
+            
             DO l=1,nlayer-1
               !! Calculation for the background dust AND the concentrated topdust
@@ -317 +320 @@
                            t_top(ig,l+1)*(pzlev(ig,l+1)-pzlay(ig,l)))  /      &
                               (pzlay(ig,l+1)-pzlay(ig,l))
-
             ENDDO ! DO l=1,nlayer-1
             !! **********************************************************************
@@ -372 +374 @@
                  ELSE
                     newzt(ig,l)=newzt(ig,l-1)+ &
-                               ( (deltahr(ig,l)/-wfin(ig,l))-g/cpp )*  &
+                               ( (deltahr(ig,l)/(-wfin(ig,l)))-g/cpp )*  &
                                ( pzlay(ig,l)-pzlay(ig,l-1) )
                  ENDIF ! (zdtvert(ig,l) .lt. -g/cpp)