Any easy way to see the SASAS diffs

GFS_layer/GFS_driver.F90

@@ -250,69 +250,41 @@ subroutine GFS_time_vary_step (Model, Statein, Stateout, Sfcprop, Coupling, &
     type(GFS_radtend_type),   intent(inout) :: Radtend(:)
     type(GFS_diag_type),      intent(inout) :: Diag(:)
     !--- local variables
-    integer :: nb, nblks
+    integer :: nblks
     real(kind=kind_phys) :: rinc(5)
     real(kind=kind_phys) :: sec
 
-    nblks = size(blksz)
+
+      ! Set the value of nblks
+    call Set_nblks (nblks)
+
     !--- Model%jdat is being updated directly inside of FV3GFS_cap.F90
     !--- update calendars and triggers
-    rinc(1:5)   = 0
-    call w3difdat(Model%jdat,Model%idat,4,rinc)
-    sec = rinc(4)
-    Model%phour = sec/con_hr
-    !--- set current bucket hour
-    Model%zhour = Model%phour
-    Model%fhour = (sec + Model%dtp)/con_hr
-    Model%kdt   = nint((sec + Model%dtp)/Model%dtp)
+    call Update_cal_and_triggers (Model, rinc, sec)
 
-    Model%ipt    = 1
-    Model%lprnt  = .false.
-    Model%lssav  = .true.
+      !--- set current bucket hour
+    call Set_bucket_hour (Model, sec)
 
-    !--- radiation triggers
-    Model%lsswr  = (mod(Model%kdt, Model%nsswr) == 1)
-    Model%lslwr  = (mod(Model%kdt, Model%nslwr) == 1)
+      !--- radiation triggers
+    call Set_radiation_triggers (Model)
 
     !--- set the solar hour based on a combination of phour and time initial hour
-    Model%solhr  = mod(Model%phour+Model%idate(1),con_24)
+    call Set_solar_h (Model)
 
-    if ((Model%debug) .and. (Model%me == Model%master)) then
-      print *,'   sec ', sec
-      print *,'   kdt ', Model%kdt
-      print *,' nsswr ', Model%nsswr
-      print *,' nslwr ', Model%nslwr
-      print *,' nscyc ', Model%nscyc
-      print *,' lsswr ', Model%lsswr
-      print *,' lslwr ', Model%lslwr
-      print *,' fhour ', Model%fhour
-      print *,' phour ', Model%phour
-      print *,' solhr ', Model%solhr
-    endif
+      ! Print debug info
+    call Print_debug_info (Model, sec)
 
     !--- radiation time varying routine
-    if (Model%lsswr .or. Model%lslwr) then
-      call GFS_rad_time_vary (Model, Statein, Tbd, sec)
-    endif
+    call Gfs_rad_time_vary_driver (Model, Statein, Tbd, sec)
 
     !--- physics time varying routine
     call GFS_phys_time_vary (Model, Grid, Tbd)
 
     !--- repopulate specific time-varying sfc properties for AMIP/forecast runs
-    if (Model%nscyc >  0) then
-      if (mod(Model%kdt,Model%nscyc) == 1) THEN
-        call gcycle (nblks, Model, Grid(:), Sfcprop(:), Cldprop(:))
-      endif
-    endif
+    call Gcycle_driver (nblks, Model, Grid, Sfcprop, Cldprop)
 
     !--- determine if diagnostics buckets need to be cleared
-    if (mod(Model%kdt,Model%nszero) == 1) then
-      do nb = 1,nblks
-        call Diag(nb)%rad_zero  (Model)
-        call Diag(nb)%phys_zero (Model)
-    !!!!  THIS IS THE POINT AT WHICH DIAG%ZHOUR NEEDS TO BE UPDATED
-      enddo
-    endif
+    call Clear_buckets (Model, Diag, nblks)
 
   end subroutine GFS_time_vary_step
 
@@ -582,5 +554,161 @@ subroutine GFS_grid_populate (Grid, xlon, xlat, area)
 
   end subroutine GFS_grid_populate
 
+
+    ! Subroutines added by PAJ
+
+  subroutine Set_nblks (nblks)
+
+    implicit none
+
+    integer, intent(out) :: nblks
+
+      ! blksz is a global var
+    nblks = size(blksz)
+
+  end subroutine Set_nblks
+
+
+  subroutine Update_cal_and_triggers (Model, rinc, sec)
+
+    implicit none
+
+    type(GFS_control_type), intent(inout) :: Model
+    real(kind=kind_phys),   intent(inout) :: rinc(:)
+    real(kind=kind_phys),   intent(inout) :: sec
+
+
+    rinc(1:5) = 0
+    call W3difdat (Model%jdat, Model%idat, 4, rinc)
+    sec = rinc(4)
+    Model%phour = sec/con_hr
+
+  end subroutine Update_cal_and_triggers
+
+
+  subroutine Set_bucket_hour (Model, sec)
+
+    implicit none
+
+    type(GFS_control_type), intent(inout) :: Model
+    real(kind=kind_phys),   intent(in)    :: sec
+
+    Model%zhour = Model%phour
+     ! con_hr is a global var
+    Model%fhour = (sec + Model%dtp)/con_hr
+    Model%kdt   = nint((sec + Model%dtp)/Model%dtp)
+
+    Model%ipt    = 1
+    Model%lprnt  = .false.
+    Model%lssav  = .true.
+
+  end subroutine Set_bucket_hour
+
+
+  subroutine Set_radiation_triggers (Model)
+
+    implicit none
+
+    type(GFS_control_type), intent(inout) :: Model
+
+    Model%lsswr = (mod (Model%kdt, Model%nsswr) == 1)
+    Model%lslwr = (mod (Model%kdt, Model%nslwr) == 1)
+
+  end subroutine Set_radiation_triggers
+
+
+  subroutine Set_solar_h (Model)
+
+    implicit none
+
+    type(GFS_control_type), intent(inout) :: Model
+
+      ! con_24 is a global variable
+    Model%solhr  = mod (Model%phour + Model%idate(1), con_24)
+
+  end subroutine Set_solar_h
+
+
+  subroutine Print_debug_info (Model, sec)
+
+    implicit none
+
+    type(GFS_control_type), intent(inout) :: Model
+    real(kind=kind_phys),   intent(in)    :: sec
+
+    if ((Model%debug) .and. (Model%me == Model%master)) then
+      print *,'   sec ', sec
+      print *,'   kdt ', Model%kdt
+      print *,' nsswr ', Model%nsswr
+      print *,' nslwr ', Model%nslwr
+      print *,' nscyc ', Model%nscyc
+      print *,' lsswr ', Model%lsswr
+      print *,' lslwr ', Model%lslwr
+      print *,' fhour ', Model%fhour
+      print *,' phour ', Model%phour
+      print *,' solhr ', Model%solhr
+    endif
+
+  end subroutine Print_debug_info
+
+
+  subroutine Gfs_rad_time_vary_driver (Model, Statein, Tbd, sec)
+
+    implicit none
+
+    type(GFS_control_type), intent(inout) :: Model
+    type(GFS_statein_type), intent(in)    :: Statein(:)
+    type(GFS_tbd_type),     intent(inout) :: Tbd(:)
+    real(kind=kind_phys),   intent(in)    :: sec
+
+    if (Model%lsswr .or. Model%lslwr) then
+      call GFS_rad_time_vary (Model, Statein, Tbd, sec)
+    endif
+
+  end subroutine Gfs_rad_time_vary_driver
+
+
+  subroutine Gcycle_driver (nblks, Model, Grid, Sfcprop, Cldprop)
+
+    implicit none
+
+    integer,                intent(in)    :: nblks
+    type(GFS_control_type), intent(in)    :: Model
+    type(GFS_grid_type),    intent(in)    :: Grid(nblks)
+    type(GFS_sfcprop_type), intent(inout) :: Sfcprop(nblks)
+    type(GFS_cldprop_type), intent(inout) :: Cldprop(nblks)
+
+
+    if (Model%nscyc >  0) then
+      if (mod (Model%kdt, Model%nscyc) == 1) then
+        call gcycle (nblks, Model, Grid(:), Sfcprop(:), Cldprop(:))
+      end if
+    end if
+
+  end subroutine Gcycle_driver
+
+
+  subroutine Clear_buckets (Model, Diag, nblks)
+
+    implicit none
+
+    type(GFS_control_type), intent(in)    :: Model
+    type(GFS_diag_type),    intent(inout) :: Diag(:)
+    integer,                intent(in)    :: nblks
+
+      ! Local vars
+    integer :: nb
+
+
+    if (mod (Model%kdt, Model%nszero) == 1) then
+      do nb = 1, nblks
+        call Diag(nb)%rad_zero  (Model)
+        call Diag(nb)%phys_zero (Model)
+      enddo
+    endif
+
+  end subroutine Clear_buckets
+
+
 end module GFS_driver
 

GFS_layer/GFS_physics_driver.F90

@@ -1680,8 +1680,9 @@ subroutine GFS_physics_driver                         &
                         islmsk, Statein%vvl, Model%ncld, ud_mf, dd_mf,  &
                         dt_mf, cnvw, cnvc)
         elseif (Model%imfdeepcnv == 2) then
-          call mfdeepcnv (im, ix, levs, dtp, del, Statein%prsl,         &
-                          Statein%pgr, Statein%phil, clw(:,:,1:2), Stateout%gq0, &
+          call sasasdeep_run (im, ix, levs, dtp, del, Statein%prsl,     &
+                          Statein%pgr, Statein%phil, clw(:,:,1),        &
+                          clw(:,:,2), Stateout%gq0(:,:,1),              &
                           Stateout%gt0, Stateout%gu0, Stateout%gv0,     &
                           cld1d, rain1, kbot, ktop, kcnv, islmsk,       &
                           garea, Statein%vvl, Model%ncld, ud_mf, dd_mf, &

GFS_layer/GFS_radiation_driver.F90

@@ -1,7 +1,7 @@
 !> \file grrad.f This file is the radiation driver module. It prepares
 !! the atmospheric profiles and invokes the main radiation calculation.
 
-!> \defgroup rad RRTMG Shortwave/Longwave Radiation Scheme
+!> \defgroup RRTMG RRTMG Shortwave/Longwave Radiation
 !> @{
 !!  \brief The GFS radiation scheme
 !!  \details Radiative processes are among the most complex and
@@ -1018,7 +1018,7 @@ subroutine GFS_radiation_driver                       &
       type(GFS_cldprop_type),         intent(in)    :: Cldprop
       type(GFS_radtend_type),         intent(inout) :: Radtend
       type(GFS_diag_type),            intent(inout) :: Diag
-        
+
 
 ! =================   subprogram documentation block   ================ !
 !                                                                       !
@@ -1180,7 +1180,7 @@ subroutine GFS_radiation_driver                       &
       integer, dimension(size(Grid%xlon,1),3) :: mbota, mtopa
 
       !--- REAL VARIABLES
-      real(kind=kind_phys) :: raddt, es, qs, delt, tem0d 
+      real(kind=kind_phys) :: raddt, es, qs, delt, tem0d
 
       real(kind=kind_phys), dimension(size(Grid%xlon,1)) ::             &
            tsfa, cvt1, cvb1, tem1d, tsfg, tskn
@@ -1328,7 +1328,7 @@ subroutine GFS_radiation_driver                       &
 
 !>  - Call coszmn(), to compute cosine of zenith angle.
       call coszmn (Grid%xlon,Grid%sinlat,           &     !  ---  inputs
-                   Grid%coslat,Model%solhr, IM, me, & 
+                   Grid%coslat,Model%solhr, IM, me, &
                    Radtend%coszen, Radtend%coszdg)        !  ---  outputs
 
 !>  - Call getgases(), to set up non-prognostic gas volume mixing
@@ -1609,12 +1609,12 @@ subroutine GFS_radiation_driver                       &
                         htswc, Diag%topfsw, Radtend%sfcfsw,     &      !  ---  outputs
                         hsw0=htsw0, fdncmp=scmpsw)                     ! ---  optional
           else
-            call swrad (plyr, plvl, tlyr, tlvl, qlyr, olyr,     &      !  ---  inputs 
+            call swrad (plyr, plvl, tlyr, tlvl, qlyr, olyr,     &      !  ---  inputs
                         gasvmr, clouds, Tbd%icsdsw, faersw,     &
                         sfcalb, Radtend%coszen, Model%solcon,   &
                         nday, idxday, IM, LMK, LMP, Model%lprnt,&
-                        htswc, Diag%topfsw, Radtend%sfcfsw,     &      !  ---  outputs 
-                        FDNCMP=scmpsw)                                 ! ---  optional 
+                        htswc, Diag%topfsw, Radtend%sfcfsw,     &      !  ---  outputs
+                        FDNCMP=scmpsw)                                 ! ---  optional
           endif
 
           do k = 1, LM
@@ -1636,7 +1636,7 @@ subroutine GFS_radiation_driver                       &
              ! --- repopulate the points above levr
              if (Model%levr < Model%levs) then
                do k = LM,Model%levs
-                 Radtend%swhc(:,k) = Radtend%swhc(:,LM) 
+                 Radtend%swhc(:,k) = Radtend%swhc(:,LM)
                enddo
              endif
           endif
@@ -1693,7 +1693,7 @@ subroutine GFS_radiation_driver                       &
 
         call setemis (Grid%xlon, Grid%xlat, Sfcprop%slmsk,         &        !  ---  inputs
                       Sfcprop%snowd, Sfcprop%sncovr, Sfcprop%zorl, &
-                      tsfg, tsfa, Sfcprop%hprim, IM,               & 
+                      tsfg, tsfa, Sfcprop%hprim, IM,               &
                       Radtend%semis)                                              !  ---  outputs
 
 !>  - Call module_radlw_main::lwrad(), to compute LW heating rates and
@@ -1736,7 +1736,7 @@ subroutine GFS_radiation_driver                       &
           ! --- repopulate the points above levr
           if (Model%levr < Model%levs) then
             do k = LM,Model%levs
-              Radtend%lwhc(:,k) = Radtend%lwhc(:,LM) 
+              Radtend%lwhc(:,k) = Radtend%lwhc(:,LM)
             enddo
           endif
         endif