Merge pull request #1 from KuangLab-Harvard/main

Merge from Nat's updates

Author: Qiyu-Song

forcing.f90

@@ -356,6 +356,9 @@ subroutine forcing
    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) 

params.f90

@@ -223,6 +223,10 @@ module params
 real    :: zhadmax  = 15000.
 real    :: hadscale_time = 0.
 
+! No large-scale vertical advection of moisture and temperature
+logical :: noqlsvadv = .false.
+logical :: notlsvadv = .false.
+
 ! Kuang-Lab Additions End Here
 !=====================================================
 

setparm.f90

@@ -62,7 +62,8 @@ subroutine setparm
                 sstislands_nrow, sstislands_ncol, sstislands_sep, &
                 readlsm, lsmfile, &
                 nrestart_resetsst, &
-                dosepstat, nstep_sepstat
+                dosepstat, nstep_sepstat, &
+                noqlsvadv, notlsvadv
 
 !bloss: Create dummy namelist, so that we can figure out error code
 !       for a mising namelist.  This lets us differentiate between

wtg_jas2008.f90

@@ -11,7 +11,8 @@ subroutine wtg_jas2008
    integer :: ktrop1
    real :: ztrop
    real :: ztrop1
-   real    :: min_temp
+   real :: min_temp
+   real :: coef, buffer(nzm), buffer1(nzm)
 
    if (dowtg_timedependence) then
 
@@ -79,7 +80,20 @@ subroutine wtg_jas2008
    end if
 
    tv_lsbg = tg0   * (1. + 0.61*qg0)
-   tv_wave = tabs0 * (1. + 0.61*qv0 - qn0 - qp0)
+
+   if(dompiensemble) then
+      coef = 1. / nsubdomains
+      do k = 1, nzm
+         buffer(k) = tabs0(k) * (1. + 0.61*qv0(k) - qn0(k) - qp0(k))
+      end do
+      call task_sum_real8(buffer,buffer1,nzm)
+      do k = 1, nzm
+         tv_wave(k) = buffer1(k) * coef
+      end do
+   else
+      tv_wave = tabs0 * (1. + 0.61*qv0 - qn0 - qp0)
+   end if
+
    dwwtgdt = 0.
 
    call calc_wtend(0.5*pi/lambda_wtg, w_wtg(1:ktrop), dwwtgdt(1:ktrop), &