Merge pull request #5 from climbfuji/update_master_from_gmtb_develop_…

…20191016

Update master from gmtb/develop 2019/10/16

makefile

@@ -96,7 +96,6 @@ $(LIBRARY): $(OBJS)
 ./model/nh_utils.o : ./model/nh_utils.F90
  $(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) $(OTHER_FFLAGS) $(FAST) -c $< -o $@
 
-# For PROD/TRANSITION, this is overwritten below
 ./model/fv_mapz.o : ./model/fv_mapz.F90
  $(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) $(OTHER_FFLAGS) $(FAST) -c $< -o $@
 
@@ -107,20 +106,6 @@ $(LIBRARY): $(OBJS)
 ./driver/fvGFS/atmosphere.o : ./driver/fvGFS/atmosphere.F90
  $(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) $(OTHER_FFLAGS) $(ESMF_INC) -c $< -o $@
 
-# For CCPP acceptance: reduce optimization for certain files to
-# obtain bit-for-bit identical results in PROD mode on Theia/Intel 15
-ifneq (,$(findstring TRANSITION,$(CPPDEFS)))
-FFLAGS_LOPT=$(subst CORE-AVX2,CORE-AVX-I,\
- $(subst no-prec-div,prec-div,\
- $(subst no-prec-sqrt,prec-sqrt,$(FFLAGS))))
-./model/dyn_core.o : ./model/dyn_core.F90
- $(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS_LOPT) $(OTHER_FFLAGS) -c $< -o $@
-./model/fv_mapz.o : ./model/fv_mapz.F90
- $(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS_LOPT) $(OTHER_FFLAGS) $(FAST) -c $< -o $@
-./model/fv_cmp.o : ./model/fv_cmp.F90
- $(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS_LOPT) $(OTHER_FFLAGS) -c $< -o $@
-endif # (,$(findstring TRANSITION,$(CPPDEFS)))
-
 .PHONY: clean
 clean:
  @echo "Cleaning fv3core ... "

model/fv_mapz.F90

@@ -201,10 +201,6 @@ subroutine Lagrangian_to_Eulerian(last_step, consv, ps, pe, delp, pkz, pk, &
  real, intent(inout):: dtdt(is:ie,js:je,km)
  real, intent(out):: pkz(is:ie,js:je,km) !< layer-mean pk for converting t to pt
  real, intent(out):: te(isd:ied,jsd:jed,km)
-#if !defined(CCPP) && defined(TRANSITION)
- ! For bit-for-bit reproducibility
- real, volatile:: volatile_var
-#endif
 
 ! !DESCRIPTION:
 !
@@ -663,9 +659,6 @@ subroutine Lagrangian_to_Eulerian(last_step, consv, ps, pe, delp, pkz, pk, &
 !$OMP ng,gridstruct,E_Flux,pdt,dtmp,reproduce_sum,q, &
 !$OMP mdt,cld_amt,cappa,dtdt,out_dt,rrg,akap,do_sat_adj, &
 !$OMP fast_mp_consv,kord_tm) &
-#ifdef TRANSITION
-!$OMP private(volatile_var) &
-#endif
 #ifdef MULTI_GASES
 !$OMP shared(num_gas) &
 #endif
@@ -854,28 +847,13 @@ subroutine Lagrangian_to_Eulerian(last_step, consv, ps, pe, delp, pkz, pk, &
  do j=js,je
  do i=is,ie
 #ifdef MOIST_CAPPA
-#ifdef TRANSITION
- volatile_var = log(rrg*delp(i,j,k)/delz(i,j,k)*pt(i,j,k))
- pkz(i,j,k) = exp(cappa(i,j,k)*volatile_var)
-#else
  pkz(i,j,k) = exp(cappa(i,j,k)*log(rrg*delp(i,j,k)/delz(i,j,k)*pt(i,j,k)))
-#endif
-#else
-#ifdef TRANSITION
-#ifdef MULTI_GASES
- volatile_var = log(rrg*delp(i,j,k)/delz(i,j,k)*pt(i,j,k))
- pkz(i,j,k) = exp(akap*(virqd(q(i,j,k,1:num_gas))/vicpqd(q(i,j,k,1:num_gas))*volatile_var)
-#else
- volatile_var = log(rrg*delp(i,j,k)/delz(i,j,k)*pt(i,j,k))
- pkz(i,j,k) = exp(akap*volatile_var)
-#endif
 #else
 #ifdef MULTI_GASES
  pkz(i,j,k) = exp(akap*(virqd(q(i,j,k,1:num_gas))/vicpqd(q(i,j,k,1:num_gas))*log(rrg*delp(i,j,k)/delz(i,j,k)*pt(i,j,k)))
 #else
  pkz(i,j,k) = exp(akap*log(rrg*delp(i,j,k)/delz(i,j,k)*pt(i,j,k)))
 #endif
-#endif
 #endif
  enddo
  enddo