physics/GFS_debug.F90, physics/sfc_drv_ruc.F90: bugfixes after removi…

…ng sr from and change to use Sfcprop%wetness for RUC LSM instead of Diag%wet1 for RUC LSM
grantfirl · Jun 29, 2019 · f42f84c · f42f84c
1 parent 36717e3
commit f42f84c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/physics/GFS_debug.F90 b/physics/GFS_debug.F90
@@ -174,7 +174,6 @@ subroutine GFS_diagtoscreen_run (Model, Statein, Stateout, Sfcprop, Coupling,
                      call print_var(mpirank,omprank, blkno, 'Sfcprop%f10m'     , Sfcprop%f10m)
                      call print_var(mpirank,omprank, blkno, 'Sfcprop%tprcp'    , Sfcprop%tprcp)
                      call print_var(mpirank,omprank, blkno, 'Sfcprop%srflag'   , Sfcprop%srflag)
-                     call print_var(mpirank,omprank, blkno, 'Sfcprop%sr'       , Sfcprop%sr)
                      call print_var(mpirank,omprank, blkno, 'Sfcprop%slc'      , Sfcprop%slc)
                      call print_var(mpirank,omprank, blkno, 'Sfcprop%smc'      , Sfcprop%smc)
                      call print_var(mpirank,omprank, blkno, 'Sfcprop%stc'      , Sfcprop%stc)
@@ -321,10 +320,16 @@ subroutine GFS_diagtoscreen_run (Model, Statein, Stateout, Sfcprop, Coupling,
                      call print_var(mpirank,omprank, blkno, 'Diag%epi         ',    Diag%epi)
                      call print_var(mpirank,omprank, blkno, 'Diag%smcwlt2     ',    Diag%smcwlt2)
                      call print_var(mpirank,omprank, blkno, 'Diag%smcref2     ',    Diag%smcref2)
+                     call print_var(mpirank,omprank, blkno, 'Diag%sr          ',    Diag%sr)
                      call print_var(mpirank,omprank, blkno, 'Diag%tdomr       ',    Diag%tdomr)
                      call print_var(mpirank,omprank, blkno, 'Diag%tdomzr      ',    Diag%tdomzr)
                      call print_var(mpirank,omprank, blkno, 'Diag%tdomip      ',    Diag%tdomip)
                      call print_var(mpirank,omprank, blkno, 'Diag%tdoms       ',    Diag%tdoms)
+                     if (Model%lsm == Model%lsm_ruc) then
+                       call print_var(mpirank,omprank, blkno, 'Diag%wet1        ',  Sfcprop%wetness)
+                     else
+                       call print_var(mpirank,omprank, blkno, 'Diag%wet1        ',  Diag%wet1)
+                     end if
                      call print_var(mpirank,omprank, blkno, 'Diag%skebu_wts   ',    Diag%skebu_wts)
                      call print_var(mpirank,omprank, blkno, 'Diag%skebv_wts   ',    Diag%skebv_wts)
                      call print_var(mpirank,omprank, blkno, 'Diag%sppt_wts    ',    Diag%sppt_wts)

diff --git a/physics/sfc_drv_ruc.F90 b/physics/sfc_drv_ruc.F90
@@ -612,7 +612,7 @@ subroutine lsm_ruc_run                                            & ! inputs
 
       ! Set flag for mixed phase precipitation depending on microphysics scheme.
       ! For GFDL and Thompson, srflag is fraction of frozen precip for convective+explicit precip.
-      if (imp_physics==imp_physics_gfdlmp .or. imp_physics==imp_physics_thompson) then
+      if (imp_physics==imp_physics_gfdl .or. imp_physics==imp_physics_thompson) then
         frpcpn = .true.
       else
         frpcpn = .false.