Skip to content

Commit

Permalink
Reverted some changes.
Browse files Browse the repository at this point in the history
  • Loading branch information
dustinswales committed Feb 19, 2020
1 parent e201f08 commit 244d3ef
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 13 deletions.
8 changes: 0 additions & 8 deletions .gitignore

This file was deleted.

7 changes: 4 additions & 3 deletions physics/GFS_rrtmg_pre.F90
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
module GFS_rrtmg_pre

public GFS_rrtmg_pre_run

contains

!> \defgroup GFS_rrtmg_pre GFS RRTMG Scheme Pre
Expand Down Expand Up @@ -274,7 +275,7 @@ subroutine GFS_rrtmg_pre_run (Model, Grid, Sfcprop, Statein, & ! input
tracer1(:,k1,j) = max(0.0, Statein%qgrs(:,k2,j))
enddo
enddo

!
if (ivflip == 0) then ! input data from toa to sfc
do i = 1, IM
plvl(i,1+kd) = 0.01 * Statein%prsi(i,1) ! pa to mb (hpa)
Expand Down Expand Up @@ -592,7 +593,6 @@ subroutine GFS_rrtmg_pre_run (Model, Grid, Sfcprop, Statein, & ! input
enddo
endif
!

if (Model%uni_cld) then
if (Model%effr_in) then
do k=1,lm
Expand Down Expand Up @@ -690,12 +690,13 @@ subroutine GFS_rrtmg_pre_run (Model, Grid, Sfcprop, Statein, & ! input
effrs(i,lyb) = effrs(i,lya)
enddo
endif
endif
endif

if (Model%imp_physics == 99) then
ccnd(1:IM,1:LMK,1) = ccnd(1:IM,1:LMK,1) + cnvw(1:IM,1:LMK)
endif


if (Model%imp_physics == 99 .or. Model%imp_physics == 10) then ! zhao/moorthi's prognostic cloud scheme
! or unified cloud and/or with MG microphysics

Expand Down
2 changes: 0 additions & 2 deletions physics/module_mp_thompson.F90
Original file line number Diff line number Diff line change
Expand Up @@ -444,7 +444,6 @@ SUBROUTINE thompson_init(nwfa2d, nifa2d, nwfa, nifa, &
LOGICAL, PARAMETER :: precomputed_tables = .FALSE.
#endif

write(*,"(a45,3i20)") 'MODULE_MP_THOMPSON(thompson_init): MPI ranks: ',mpirank,mpiroot,mpicomm


is_aerosol_aware = .FALSE.
Expand Down Expand Up @@ -5586,7 +5585,6 @@ subroutine readwrite_tables(mode, mpicomm, mpirank, mpiroot, ierr)
continue

ierr = 0
write(*,"(a45,3i20)") 'MODULE_MP_THOMPSON(readwrite_tables): MPI ranks: ',mpirank,mpiroot,mpicomm

! Test if SIONlib file containing pre-computed tables exists
inquire(file=trim(filename), exist=exists)
Expand Down

0 comments on commit 244d3ef

Please sign in to comment.