From 799d9432b84370101feadb0df20c14a043ea11a8 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Tue, 12 Apr 2022 10:49:27 -0600 Subject: [PATCH] Rename CCPP_interstitial to GFDL_interstitial (#181) --- driver/fvGFS/atmosphere.F90 | 4 ++-- model/fv_dynamics.F90 | 16 ++++++++-------- model/fv_mapz.F90 | 12 ++++++------ 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/driver/fvGFS/atmosphere.F90 b/driver/fvGFS/atmosphere.F90 index 6243df9d0..7af45f664 100644 --- a/driver/fvGFS/atmosphere.F90 +++ b/driver/fvGFS/atmosphere.F90 @@ -294,7 +294,7 @@ subroutine atmosphere_init (Time_init, Time, Time_step, Grid_box, area) use ccpp_static_api, only: ccpp_physics_init use CCPP_data, only: ccpp_suite, & cdata => cdata_tile, & - CCPP_interstitial + GFDL_interstitial #ifdef OPENMP use omp_lib #endif @@ -512,7 +512,7 @@ subroutine atmosphere_init (Time_init, Time, Time_step, Grid_box, area) #endif ! Create interstitial data type for fast physics; for multi-gases physics, ! pass q(:,:,:,1:num_gas) as qvi, otherwise pass q(:,:,:,1:1) as 4D array - call CCPP_interstitial%create(Atm(mygrid)%bd%is, Atm(mygrid)%bd%ie, Atm(mygrid)%bd%isd, Atm(mygrid)%bd%ied, & + call GFDL_interstitial%create(Atm(mygrid)%bd%is, Atm(mygrid)%bd%ie, Atm(mygrid)%bd%isd, Atm(mygrid)%bd%ied, & Atm(mygrid)%bd%js, Atm(mygrid)%bd%je, Atm(mygrid)%bd%jsd, Atm(mygrid)%bd%jed, & Atm(mygrid)%npz, Atm(mygrid)%ng, & dt_atmos, p_split, Atm(mygrid)%flagstruct%k_split, & diff --git a/model/fv_dynamics.F90 b/model/fv_dynamics.F90 index 1143324b7..ed6836f15 100644 --- a/model/fv_dynamics.F90 +++ b/model/fv_dynamics.F90 @@ -194,7 +194,7 @@ subroutine fv_dynamics(npx, npy, npz, nq_tot, ng, bdt, consv_te, fill, ccpp_physics_timestep_finalize use CCPP_data, only: ccpp_suite use CCPP_data, only: cdata => cdata_tile - use CCPP_data, only: CCPP_interstitial + use CCPP_data, only: GFDL_interstitial use molecular_diffusion_mod, only: md_time, md_wait_sec, md_tadj_layers, & thermosphere_adjustment @@ -299,11 +299,11 @@ subroutine fv_dynamics(npx, npy, npz, nq_tot, ng, bdt, consv_te, fill, real :: time_total integer :: seconds, days - ccpp_associate: associate( cappa => CCPP_interstitial%cappa, & - dp1 => CCPP_interstitial%te0, & - dtdt_m => CCPP_interstitial%dtdt, & - last_step => CCPP_interstitial%last_step, & - te_2d => CCPP_interstitial%te0_2d ) + ccpp_associate: associate( cappa => GFDL_interstitial%cappa, & + dp1 => GFDL_interstitial%te0, & + dtdt_m => GFDL_interstitial%dtdt, & + last_step => GFDL_interstitial%last_step, & + te_2d => GFDL_interstitial%te0_2d ) is = bd%is ie = bd%ie @@ -329,9 +329,9 @@ subroutine fv_dynamics(npx, npy, npz, nq_tot, ng, bdt, consv_te, fill, call ccpp_physics_timestep_init(cdata, suite_name=trim(ccpp_suite), group_name="fast_physics", ierr=ierr) ! Reset all interstitial variables for CCPP version ! of fast physics, and manually set runtime parameters - call CCPP_interstitial%reset() + call GFDL_interstitial%reset() if (flagstruct%do_sat_adj) then - CCPP_interstitial%out_dt = (idiag%id_mdt > 0) + GFDL_interstitial%out_dt = (idiag%id_mdt > 0) end if #ifdef MULTI_GASES diff --git a/model/fv_mapz.F90 b/model/fv_mapz.F90 index add25e28b..00914df76 100644 --- a/model/fv_mapz.F90 +++ b/model/fv_mapz.F90 @@ -61,7 +61,7 @@ module fv_mapz_mod ! ! ! CCPP_data -! ccpp_suite, cdata_tile, CCPP_interstitial +! ccpp_suite, cdata_tile, GFDL_interstitial ! ! ! fv_timing_mod @@ -99,7 +99,7 @@ module fv_mapz_mod use ccpp_static_api, only: ccpp_physics_run use CCPP_data, only: ccpp_suite use CCPP_data, only: cdata => cdata_tile - use CCPP_data, only: CCPP_interstitial + use CCPP_data, only: GFDL_interstitial #ifdef MULTI_GASES use multi_gases_mod, only: virq, virqd, vicpqd, vicvqd, num_gas #endif @@ -229,8 +229,8 @@ subroutine Lagrangian_to_Eulerian(last_step, consv, ps, pe, delp, pkz, pk, & integer:: nt, liq_wat, ice_wat, rainwat, snowwat, cld_amt, graupel, hailwat, ccn_cm3, iq, n, kmp, kp, k_next integer :: ierr - ccpp_associate: associate( fast_mp_consv => CCPP_interstitial%fast_mp_consv, & - kmp => CCPP_interstitial%kmp ) + ccpp_associate: associate( fast_mp_consv => GFDL_interstitial%fast_mp_consv, & + kmp => GFDL_interstitial%kmp ) k1k = rdgas/cv_air ! akap / (1.-akap) = rg/Cv=0.4 rg = rdgas @@ -673,7 +673,7 @@ 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 kord_tm,pe4, npx,npy,ccn_cm3,u_dt,v_dt, c2l_ord,bd,dp0,ps, & -!$OMP cdata,CCPP_interstitial) & +!$OMP cdata,GFDL_interstitial) & !$OMP shared(ccpp_suite) & #ifdef MULTI_GASES !$OMP shared(num_gas) & @@ -688,7 +688,7 @@ 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, pe4,npx,npy, ccn_cm3, & -!$OMP u_dt,v_dt,c2l_ord,bd,dp0,ps,cdata,CCPP_interstitial) & +!$OMP u_dt,v_dt,c2l_ord,bd,dp0,ps,cdata,GFDL_interstitial) & !$OMP shared(ccpp_suite) & #ifdef MULTI_GASES !$OMP shared(num_gas) &