Merge pull request #1 from climbfuji/hannah_GF_RadiationUpdate_RevertAerosols_dom_20210823

Hannah gf radiation update revert aerosols dom 20210823

Author: hannahcbarnes

physics/GFS_debug.F90

@@ -1267,6 +1267,7 @@ subroutine GFS_interstitialtoscreen_run (Model, Statein, Stateout, Sfcprop, Coup
                      call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Interstitial%kpbl                ', Interstitial%kpbl                    )
                      call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Interstitial%kt                  ', Interstitial%kt                      )
                      call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Interstitial%ktop                ', Interstitial%ktop                    )
+                     call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Interstitial%max_hourly_reset    ', Interstitial%max_hourly_reset        )
                      call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Interstitial%mbota               ', Interstitial%mbota                   )
                      call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Interstitial%mtopa               ', Interstitial%mtopa                   )
                      call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Interstitial%nday                ', Interstitial%nday                    )
@@ -1291,7 +1292,6 @@ subroutine GFS_interstitialtoscreen_run (Model, Statein, Stateout, Sfcprop, Coup
                      call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Interstitial%rb_ice              ', Interstitial%rb_ice                  )
                      call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Interstitial%rb_land             ', Interstitial%rb_land                 )
                      call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Interstitial%rb_water            ', Interstitial%rb_water                )
-                     call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Interstitial%reset               ', Interstitial%reset                   )
                      call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Interstitial%rhc                 ', Interstitial%rhc                     )
                      call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Interstitial%runoff              ', Interstitial%runoff                  )
                      call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Interstitial%save_q              ', Interstitial%save_q                  )

physics/cu_gf_deep.F90

@@ -388,11 +388,13 @@ subroutine cu_gf_deep_run(        &
 !
 !---------------------------------------------------- ! HCB
 ! Set cloud water to rain water conversion rate (c0)
+      c0(:)=0.004
       do i=its,itf
-         c0(i)=0.004
          xland1(i)=int(xland(i)+.0001) ! 1.
+         if(xland(i).gt.1.5 .or. xland(i).lt.0.5)then
+             xland1(i)=0
+         endif
          if(xland1(i).eq.1)c0(i)=0.002
-
          if(imid.eq.1)then
            c0(i)=0.002
          endif
@@ -437,8 +439,7 @@ subroutine cu_gf_deep_run(        &
 !
 ! for water or ice
 !
-        if(xland(i).gt.1.5 .or. xland(i).lt.0.5)then
-            xland1(i)=0
+        if (xland1(i)==0) then
 !            if(imid.eq.0)cap_max(i)=cap_maxs-25.
 !            if(imid.eq.1)cap_max(i)=cap_maxs-50.
             cap_max_increment(i)=20.
@@ -4083,7 +4084,7 @@ subroutine cup_up_moisture(name,ierr,z_cup,qc,qrc,pw,pwav,     &
 !
 !now do the rest
 !
-            kklev(i)=maxloc(zu(i,:),1)    
+            kklev(i)=maxloc(zu(i,:),1)
             do k=kbcon(i)+1,ktop(i)
                if(t(i,k) > 273.16) then
                   c0t = c0(i)

physics/cu_gf_driver.F90

@@ -260,10 +260,6 @@ subroutine cu_gf_driver_run(ntracer,garea,im,km,dt,flag_init,flag_restart,&
      rand_mom(:)    = 0.
      rand_vmas(:)   = 0.
      rand_clos(:,:) = 0.
-
-     cnvwtm(:,:) = 0.
-     cnvwts(:,:) = 0.
-     cnvwt(:,:) = 0.
 !
      its=1
      ite=im
@@ -446,6 +442,7 @@ subroutine cu_gf_driver_run(ntracer,garea,im,km,dt,flag_init,flag_restart,&
 
      cnvwt(:,:)=0.
      cnvwts(:,:)=0.
+     cnvwtm(:,:)=0.
 
      hco(:,:)=0.
      hcom(:,:)=0.