Merge NOAA-EMC dev/emc branch

NOAA-EMC · May 13, 2020 · ee8a899 · ee8a899 · HenryJuang-NOAA · May 13, 2020
2 parents 88b655f + 15c615f
commit ee8a899
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/driver/fvGFS/atmosphere.F90 b/driver/fvGFS/atmosphere.F90
@@ -446,6 +446,7 @@ subroutine atmosphere_init (Time_init, Time, Time_step, Grid_box, area)
                                  Atm(mygrid)%npz, Atm(mygrid)%ng,                                              &
                                  dt_atmos, p_split, Atm(mygrid)%flagstruct%k_split,                            &
                                  zvir, Atm(mygrid)%flagstruct%p_ref, Atm(mygrid)%ak, Atm(mygrid)%bk,           &
+                                 liq_wat>0, ice_wat>0, rainwat>0, snowwat>0, graupel>0,                        &
                                  cld_amt>0, kappa, Atm(mygrid)%flagstruct%hydrostatic,                         &
                                  Atm(mygrid)%flagstruct%do_sat_adj,                                            &
                                  Atm(mygrid)%delp, Atm(mygrid)%delz, Atm(mygrid)%gridstruct%area_64,           &

diff --git a/makefile b/makefile
@@ -23,7 +23,7 @@ endif
 
 LIBRARY  = libfv3core.a
 
-FFLAGS   += -I$(FMS_DIR) -I../gfsphysics -I../ipd -I../io -I../namphysics
+FFLAGS   += -I$(FMS_DIR) -I../gfsphysics -I../ipd -I../io
 
 SRCS_f   =