Skip to content

Commit 18ee6c3

Browse files
whannah1whannah1
committed
cosmetic variable renaming
1 parent 650797a commit 18ee6c3

File tree

2 files changed

+40
-38
lines changed

2 files changed

+40
-38
lines changed

‎components/eamxx/src/physics/zm/eamxx_zm_process_interface.cpp‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -319,15 +319,15 @@ size_t ZMDeepConvection::requested_buffer_size_in_bytes() const
319319
const int nlev_int_packs = ekat::npack<Spack>(m_nlev+1);
320320
size_t zm_buffer_size = 0;
321321

322-
zm_buffer_size+= ZMF::zm_input_state::num_dvc_1d_intgr * sizeof(Int) * m_ncol;
323-
zm_buffer_size+= ZMF::zm_input_state::num_dvc_1d_scalr * sizeof(Scalar)* m_ncol;
324-
zm_buffer_size+= ZMF::zm_input_state::num_dvc_2d_midlv * sizeof(Spack) * m_ncol * nlev_mid_packs;
325-
zm_buffer_size+= ZMF::zm_input_state::num_dvc_2d_intfc * sizeof(Spack) * m_ncol * nlev_int_packs;
322+
zm_buffer_size+= ZMF::zm_input_state::num_1d_intgr * sizeof(Int) * m_ncol;
323+
zm_buffer_size+= ZMF::zm_input_state::num_1d_scalr * sizeof(Scalar)* m_ncol;
324+
zm_buffer_size+= ZMF::zm_input_state::num_2d_midlv * sizeof(Spack) * m_ncol * nlev_mid_packs;
325+
zm_buffer_size+= ZMF::zm_input_state::num_2d_intfc * sizeof(Spack) * m_ncol * nlev_int_packs;
326326

327-
zm_buffer_size+= ZMF::zm_output_tend::num_dvc_1d_intgr * sizeof(Int) * m_ncol;
328-
zm_buffer_size+= ZMF::zm_output_tend::num_dvc_1d_scalr * sizeof(Scalar)* m_ncol;
329-
zm_buffer_size+= ZMF::zm_output_tend::num_dvc_2d_midlv * sizeof(Spack) * m_ncol * nlev_mid_packs;
330-
zm_buffer_size+= ZMF::zm_output_tend::num_dvc_2d_intfc * sizeof(Spack) * m_ncol * nlev_int_packs;
327+
zm_buffer_size+= ZMF::zm_output_tend::num_1d_intgr * sizeof(Int) * m_ncol;
328+
zm_buffer_size+= ZMF::zm_output_tend::num_1d_scalr * sizeof(Scalar)* m_ncol;
329+
zm_buffer_size+= ZMF::zm_output_tend::num_2d_midlv * sizeof(Spack) * m_ncol * nlev_mid_packs;
330+
zm_buffer_size+= ZMF::zm_output_tend::num_2d_intfc * sizeof(Spack) * m_ncol * nlev_int_packs;
331331

332332
return zm_buffer_size;
333333
}
@@ -342,39 +342,39 @@ void ZMDeepConvection::init_buffers(const ATMBufferManager &buffer_manager)
342342
const int nlev_mid_packs = ekat::npack<Spack>(m_nlev);
343343
const int nlev_int_packs = ekat::npack<Spack>(m_nlev+1);
344344

345-
constexpr auto num_dvc_1d_intgr = ZMF::zm_input_state::num_dvc_1d_intgr + ZMF::zm_output_tend::num_dvc_1d_intgr;
346-
constexpr auto num_dvc_1d_scalr = ZMF::zm_input_state::num_dvc_1d_scalr + ZMF::zm_output_tend::num_dvc_1d_scalr;
347-
constexpr auto num_dvc_2d_midlv = ZMF::zm_input_state::num_dvc_2d_midlv + ZMF::zm_output_tend::num_dvc_2d_midlv;
348-
constexpr auto num_dvc_2d_intfc = ZMF::zm_input_state::num_dvc_2d_intfc + ZMF::zm_output_tend::num_dvc_2d_intfc;
345+
constexpr auto num_1d_intgr = ZMF::zm_input_state::num_1d_intgr + ZMF::zm_output_tend::num_1d_intgr;
346+
constexpr auto num_1d_scalr = ZMF::zm_input_state::num_1d_scalr + ZMF::zm_output_tend::num_1d_scalr;
347+
constexpr auto num_2d_midlv = ZMF::zm_input_state::num_2d_midlv + ZMF::zm_output_tend::num_2d_midlv;
348+
constexpr auto num_2d_intfc = ZMF::zm_input_state::num_2d_intfc + ZMF::zm_output_tend::num_2d_intfc;
349349

350350
//----------------------------------------------------------------------------
351351
Int* i_mem = reinterpret_cast<Int*>(buffer_manager.get_memory());
352352
//----------------------------------------------------------------------------
353353
// device 1D integer variables
354-
ZMF::uview_1d<Int>* ptrs_dvc_1d_intgr[num_dvc_1d_intgr] = { &zm_output.activity
354+
ZMF::uview_1d<Int>* ptrs_1d_intgr[num_1d_intgr] = { &zm_output.activity
355355
};
356-
for (int i=0; i<num_dvc_1d_intgr; ++i) {
357-
*ptrs_dvc_1d_intgr[i] = ZMF::uview_1d<Int>(i_mem, m_ncol);
358-
i_mem += ptrs_dvc_1d_intgr[i]->size();
356+
for (int i=0; i<num_1d_intgr; ++i) {
357+
*ptrs_1d_intgr[i] = ZMF::uview_1d<Int>(i_mem, m_ncol);
358+
i_mem += ptrs_1d_intgr[i]->size();
359359
}
360360
//----------------------------------------------------------------------------
361361
Scalar* scl_mem = reinterpret_cast<Scalar*>(i_mem);
362362
//----------------------------------------------------------------------------
363363
// device 1D scalar scalars
364-
ZMF::uview_1d<Scalar>* ptrs_dvc_1d_scalr[num_dvc_1d_scalr] = { &zm_input.tpert,
364+
ZMF::uview_1d<Scalar>* ptrs_1d_scalr[num_1d_scalr] = { &zm_input.tpert,
365365
&zm_output.prec,
366366
&zm_output.snow,
367367
&zm_output.cape,
368368
};
369-
for (int i=0; i<num_dvc_1d_scalr; ++i) {
370-
*ptrs_dvc_1d_scalr[i] = ZMF::uview_1d<Scalar>(scl_mem, m_ncol);
371-
scl_mem += ptrs_dvc_1d_scalr[i]->size();
369+
for (int i=0; i<num_1d_scalr; ++i) {
370+
*ptrs_1d_scalr[i] = ZMF::uview_1d<Scalar>(scl_mem, m_ncol);
371+
scl_mem += ptrs_1d_scalr[i]->size();
372372
}
373373
//----------------------------------------------------------------------------
374374
Spack* spk_mem = reinterpret_cast<Spack*>(scl_mem);
375375
//----------------------------------------------------------------------------
376376
// device 2D views on mid-point levels
377-
ZMF::uview_2d<Spack>* ptrs_dvc_2d_midlv[num_dvc_2d_midlv] = { &zm_input.z_mid,
377+
ZMF::uview_2d<Spack>* ptrs_2d_midlv[num_2d_midlv] = { &zm_input.z_mid,
378378
&zm_input.z_del,
379379
&zm_output.tend_t,
380380
&zm_output.tend_qv,
@@ -383,20 +383,20 @@ void ZMDeepConvection::init_buffers(const ATMBufferManager &buffer_manager)
383383
&zm_output.rain_prod,
384384
&zm_output.snow_prod
385385
};
386-
for (int i=0; i<num_dvc_2d_midlv; ++i) {
387-
*ptrs_dvc_2d_midlv[i] = ZMF::uview_2d<Spack>(spk_mem, m_ncol, nlev_mid_packs);
388-
spk_mem += ptrs_dvc_2d_midlv[i]->size();
386+
for (int i=0; i<num_2d_midlv; ++i) {
387+
*ptrs_2d_midlv[i] = ZMF::uview_2d<Spack>(spk_mem, m_ncol, nlev_mid_packs);
388+
spk_mem += ptrs_2d_midlv[i]->size();
389389
}
390390
//----------------------------------------------------------------------------
391391
// device 2D views on interface levels
392-
ZMF::uview_2d<Spack>* ptrs_dvc_2d_intfc[num_dvc_2d_intfc] = { &zm_input.z_int,
392+
ZMF::uview_2d<Spack>* ptrs_2d_intfc[num_2d_intfc] = { &zm_input.z_int,
393393
&zm_output.prec_flux,
394394
&zm_output.snow_flux,
395395
&zm_output.mass_flux
396396
};
397-
for (int i=0; i<num_dvc_2d_intfc; ++i) {
398-
*ptrs_dvc_2d_intfc[i] = ZMF::uview_2d<Spack>(spk_mem, m_ncol, nlev_int_packs);
399-
spk_mem += ptrs_dvc_2d_intfc[i]->size();
397+
for (int i=0; i<num_2d_intfc; ++i) {
398+
*ptrs_2d_intfc[i] = ZMF::uview_2d<Spack>(spk_mem, m_ncol, nlev_int_packs);
399+
spk_mem += ptrs_2d_intfc[i]->size();
400400
}
401401
//----------------------------------------------------------------------------
402402
Real* total_mem = reinterpret_cast<Real*>(spk_mem);

‎components/eamxx/src/physics/zm/zm_functions.hpp‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,11 @@ struct Functions {
6767
Real dtime; // model phsyics time step [s]
6868
bool is_first_step; // flag for first call
6969

70-
static constexpr int num_dvc_1d_intgr = 0; // number of device 1D integer views
71-
static constexpr int num_dvc_1d_scalr = 1; // number of device 1D scalar views
72-
static constexpr int num_dvc_2d_midlv = 2; // number of device 2D views on mid-point levels
73-
static constexpr int num_dvc_2d_intfc = 1; // number of device 2D views on interface levels
70+
// variable counters for device-side only
71+
static constexpr int num_1d_intgr = 0; // number of 1D integer views
72+
static constexpr int num_1d_scalr = 1; // number of 1D scalar views
73+
static constexpr int num_2d_midlv = 2; // number of 2D mid-point views
74+
static constexpr int num_2d_intfc = 1; // number of 2D interface views
7475

7576
uview_1d< Scalar> tpert; // PBL top temperature perturb. [K]
7677
uview_2d< Spack> z_mid; // mid-point level altitude [m]
@@ -84,14 +85,14 @@ struct Functions {
8485
view_2d<const Spack> p_del; // pressure thickness [Pa]
8586
view_2d< Spack> T_mid; // temperature [K]
8687
view_2d< Spack> qv; // water vapor mixing ratio [kg kg-1]
87-
view_2d<const Spack> qc; // cloud liquid water
88+
view_2d<const Spack> qc; // cloud liquid water [kg kg-1]
8889
view_2d< Spack> uwind; // zonal wind [m/s]
8990
view_2d< Spack> vwind; // meridional wind [m/s]
9091
view_2d<const Spack> omega; // vertical pressure velocity [Pa/s]
9192
view_2d<const Spack> cldfrac; // total cloud fraction [frac]
9293
view_1d<const Scalar> pblh; // PBL height [m]
9394
view_1d<const Scalar> landfrac; // land area fraction [frac]
94-
view_2d<const Spack> thl_sec; // thetal variance for PBL temperature perturbation
95+
view_2d<const Spack> thl_sec; // thetal variance from SHOC [K^2]
9596

9697
// host mirror versions of ZM interface variables
9798
view_1dh<Scalar> h_phis;
@@ -181,10 +182,11 @@ struct Functions {
181182
struct zm_output_tend {
182183
zm_output_tend() = default;
183184

184-
static constexpr int num_dvc_1d_intgr = 1; // number of device 1D integer views
185-
static constexpr int num_dvc_1d_scalr = 3; // number of device 1D scalar views
186-
static constexpr int num_dvc_2d_midlv = 6; // number of device 2D views on mid-point levels
187-
static constexpr int num_dvc_2d_intfc = 3; // number of device 2D views on interface levels
185+
// variable counters for device-side only
186+
static constexpr int num_1d_intgr = 1; // number of 1D integer views
187+
static constexpr int num_1d_scalr = 3; // number of 1D scalar views
188+
static constexpr int num_2d_midlv = 6; // number of 2D mid-point views
189+
static constexpr int num_2d_intfc = 3; // number of 2D interface views
188190

189191
uview_1d<Int> activity; // integer deep convection activity flag
190192
uview_1d<Scalar> prec; // surface precipitation [m/s]

0 commit comments

Comments
 (0)