From 244d3efadedf9aee74787ea4374069c96ddb43e5 Mon Sep 17 00:00:00 2001 From: Dustin Swales Date: Wed, 19 Feb 2020 14:54:07 -0700 Subject: [PATCH] Reverted some changes. --- .gitignore | 8 -------- physics/GFS_rrtmg_pre.F90 | 7 ++++--- physics/module_mp_thompson.F90 | 2 -- 3 files changed, 4 insertions(+), 13 deletions(-) delete mode 100644 .gitignore diff --git a/.gitignore b/.gitignore deleted file mode 100644 index c7b16950f..000000000 --- a/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -# Auto-generated include files in Fortran code -*.inc -physics/*cap.F90 -physics/*.xml -*.cmake -*.mk -*.html -physics/rte-rrtmgp \ No newline at end of file diff --git a/physics/GFS_rrtmg_pre.F90 b/physics/GFS_rrtmg_pre.F90 index 49b7acb69..61fb05879 100644 --- a/physics/GFS_rrtmg_pre.F90 +++ b/physics/GFS_rrtmg_pre.F90 @@ -3,6 +3,7 @@ module GFS_rrtmg_pre public GFS_rrtmg_pre_run + contains !> \defgroup GFS_rrtmg_pre GFS RRTMG Scheme Pre @@ -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) @@ -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 @@ -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 diff --git a/physics/module_mp_thompson.F90 b/physics/module_mp_thompson.F90 index af6645f7b..c1c0c201c 100644 --- a/physics/module_mp_thompson.F90 +++ b/physics/module_mp_thompson.F90 @@ -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. @@ -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)