Merge pull request #20 from natgeo-wong/main

Some debugging changes to notlsvadv and noqlsvadv and dodrivenequilibrium things

Author: natgeo-wong

drivenequilibrium.f90

@@ -29,6 +29,10 @@ subroutine drivenequilibrium
   end do
 
 end do
+
+if (notlsvadv) t_tend(:,:,:) = 0.
+if (noqlsvadv) q_tend(:,:,:) = 0.
+
 do k=2,nzm-1
   t_vtend = 0.
   q_vtend = 0.

forcing.f90

@@ -322,7 +322,7 @@ subroutine forcing
 
       ! add to reference large-scale vertical velocity.
       wsub(1:nzm) = wsub(1:nzm) + w_wtg(1:nzm)
-      dosubsidence = .true.
+      if(.NOT.dodrivenequilibrium) dosubsidence = .true.
 
    end if
 
@@ -354,12 +354,10 @@ subroutine forcing
    tlsvadv(:)   = 0.
    mklsadv(:,:) = 0. ! large-scale microphysical tendencies
 
+   if(dosubsidence.AND.dodrivenequilibrium) dodrivenequilibrium = .false. 
    if(dosubsidence) call subsidence()
    if(dodrivenequilibrium) call drivenequilibrium()
 
-   if(noqlsvadv) qlsvadv(:) = 0.
-   if(notlsvadv) tlsvadv(:) = 0.
-
    ! normalize large-scale vertical momentum forcing
    ulsvadv(:) = ulsvadv(:) / float(nx*ny) 
    vlsvadv(:) = vlsvadv(:) / float(nx*ny) 

subsidence.f90

@@ -1,6 +1,7 @@
 
 subroutine subsidence()
-	
+
+use params, only: noqlsvadv, notlsvadv
 use vars
 use microphysics, only: micro_field, index_water_vapor, nmicro_fields, mklsadv
 implicit none
@@ -41,6 +42,7 @@ subroutine subsidence()
         do j=1,ny
            do i=1,nx
               dq = - rdz * (micro_field(i,j,k1,n)-micro_field(i,j,k2,n))
+              if (noqlsvadv) dq = 0.
               micro_field(i,j,k,n) = micro_field(i,j,k,n) + dtn*dq
               mklsadv(k,n) = mklsadv(k,n) + dq
            end do
@@ -49,6 +51,10 @@ subroutine subsidence()
   end do
 
 end do
+
+if (notlsvadv) t_tend(:,:,:) = 0.
+if (noqlsvadv) q_tend(:,:,:) = 0.
+
 do k=2,nzm-1
   t_vtend = 0.
   q_vtend = 0.