Skip to content

Commit e7276ea

Browse files
odiazibodiazib
committed
clang-format
1 parent 7afd29c commit e7276ea

File tree

6 files changed

+112
-126
lines changed

6 files changed

+112
-126
lines changed

‎src/mam4xx/aero_model.hpp‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -801,9 +801,10 @@ void index_ordering(const int lspec, const int imode, const int lphase, int &mm,
801801

802802
// =============================================================================
803803
KOKKOS_INLINE_FUNCTION
804-
int examine_prec_exist(const int level_for_precipitation, haero::ConstColumnView pdel,
805-
haero::ConstColumnView prain, const View1D & cmfdqr,
806-
const ConstView1D & evapr) {
804+
int examine_prec_exist(const int level_for_precipitation,
805+
haero::ConstColumnView pdel,
806+
haero::ConstColumnView prain, const View1D &cmfdqr,
807+
const ConstView1D &evapr) {
807808
// clang-format off
808809
// ----------------------------------------------------------------------
809810
// examine if level level_for_precipitation has precipitation.
@@ -879,10 +880,10 @@ void set_f_act_coarse(const int kk,
879880

880881
// =============================================================================
881882
template <typename VectorType>
882-
KOKKOS_INLINE_FUNCTION
883-
void calc_resusp_to_coarse(const int mm, const bool update_dqdt,
884-
const Real rcscavt, const Real rsscavt,
885-
Real &dqdt_tmp, const VectorType& rtscavt_sv) {
883+
KOKKOS_INLINE_FUNCTION void
884+
calc_resusp_to_coarse(const int mm, const bool update_dqdt, const Real rcscavt,
885+
const Real rsscavt, Real &dqdt_tmp,
886+
const VectorType &rtscavt_sv) {
886887
// clang-format off
887888
//-----------------------------------------------------------------------
888889
// resuspension goes to coarse mode

‎src/mam4xx/modal_aer_opt.hpp‎

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -409,9 +409,9 @@ also output wetvol and watervol
409409

410410
} // calc_refin_complex
411411
template <typename VectorType>
412-
KOKKOS_INLINE_FUNCTION
413-
void compute_factors(const int prefri, const Real ref_ind,
414-
const VectorType& ref_table, int &ix, Real &tt) {
412+
KOKKOS_INLINE_FUNCTION void
413+
compute_factors(const int prefri, const Real ref_ind,
414+
const VectorType &ref_table, int &ix, Real &tt) {
415415
// Compute factors for the real or imaginary parts
416416

417417
// prefri, ncol
@@ -459,11 +459,11 @@ void compute_factors(const int prefri, const Real ref_ind,
459459
} // compute_factors
460460

461461
template <typename VectorType>
462-
KOKKOS_INLINE_FUNCTION
463-
void binterp(const View3D &table, const Real ref_real, const Real ref_img,
464-
const VectorType& ref_real_tab, const VectorType& ref_img_tab,
465-
int &itab, int &jtab, Real &ttab, Real &utab, Real coef[ncoef],
466-
const int itab_1) {
462+
KOKKOS_INLINE_FUNCTION void
463+
binterp(const View3D &table, const Real ref_real, const Real ref_img,
464+
const VectorType &ref_real_tab, const VectorType &ref_img_tab,
465+
int &itab, int &jtab, Real &ttab, Real &utab, Real coef[ncoef],
466+
const int itab_1) {
467467
/*------------------------------------------------------------------------------
468468
Bilinear interpolation along the refractive index dimensions
469469
of the table to estimate Chebyshev coefficients at an
@@ -668,18 +668,18 @@ KOKKOS_INLINE_FUNCTION void modal_aero_sw_wo_diagnostics_k(
668668
casm[ncoef] = {}; // coefficient for extinction, absoption, and
669669
// asymmetry [unitless]
670670

671-
binterp(sub_extpsw, refr, refi, ref_real_tab, ref_img_tab,
672-
itab, jtab, ttab, utab, cext, itab_1);
671+
binterp(sub_extpsw, refr, refi, ref_real_tab, ref_img_tab, itab, jtab,
672+
ttab, utab, cext, itab_1);
673673

674674
const auto sub_abspsw = aersol_optics_data.abspsw[mm][isw];
675675

676-
binterp(sub_abspsw, refr, refi, ref_real_tab, ref_img_tab,
677-
itab, jtab, ttab, utab, cabs, itab_1);
676+
binterp(sub_abspsw, refr, refi, ref_real_tab, ref_img_tab, itab, jtab,
677+
ttab, utab, cabs, itab_1);
678678

679679
const auto sub_asmpsw = aersol_optics_data.asmpsw[mm][isw];
680680

681-
binterp(sub_asmpsw, refr, refi, ref_real_tab, ref_img_tab,
682-
itab, jtab, ttab, utab, casm, itab_1);
681+
binterp(sub_asmpsw, refr, refi, ref_real_tab, ref_img_tab, itab, jtab,
682+
ttab, utab, casm, itab_1);
683683

684684
// parameterized optical properties
685685
Real pext = zero; // parameterized specific extinction [m2/kg]
@@ -939,9 +939,8 @@ KOKKOS_INLINE_FUNCTION void modal_aero_lw_k(
939939
int jtab = zero;
940940
Real ttab, utab = {};
941941
Real cabs[ncoef] = {};
942-
binterp(aersol_optics_data.absplw[mm][ilw], refr, refi,
943-
ref_real_tab, ref_img_tab, itab, jtab, ttab, utab,
944-
cabs, itab_1);
942+
binterp(aersol_optics_data.absplw[mm][ilw], refr, refi, ref_real_tab,
943+
ref_img_tab, itab, jtab, ttab, utab, cabs, itab_1);
945944

946945
// parameterized optical properties
947946
Real pabs = zero; // parameterized specific extinction [m2/kg]

‎src/mam4xx/wet_dep.hpp‎

Lines changed: 33 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,8 @@ inline void init_scavimptbl(View2DHost scavimptblvol,
115115
// clang-format on
116116
template <typename FUNC, typename VectorType>
117117
KOKKOS_INLINE_FUNCTION void
118-
calculate_cloudy_volume(const int nlev, const VectorType& cld, FUNC lprec,
119-
const bool is_tot_cld, const View1D& cldv) {
118+
calculate_cloudy_volume(const int nlev, const VectorType &cld, FUNC lprec,
119+
const bool is_tot_cld, const View1D &cldv) {
120120
// BAD CONSTANT
121121
const Real small_value_30 = 1.e-30;
122122
const Real small_value_36 = 1.e-36;
@@ -1136,13 +1136,13 @@ void wetdepa_v2(const Real deltat, const Real pdel, const Real cmfdqr,
11361136
*/
11371137

11381138
KOKKOS_INLINE_FUNCTION
1139-
void clddiag(const int nlev, haero::ConstColumnView temperature, haero::ConstColumnView pmid,
1140-
haero::ConstColumnView pdel, const View1D &cmfdqr, const View1D &evapc,
1139+
void clddiag(const int nlev, haero::ConstColumnView temperature,
1140+
haero::ConstColumnView pmid, haero::ConstColumnView pdel,
1141+
const View1D &cmfdqr, const View1D &evapc,
11411142
const haero::ConstColumnView &cldt, const View1D &cldcu,
1142-
const View1D &cldst,
1143-
const haero::ConstColumnView &evapr, const haero::ConstColumnView & prain,
1144-
const View1D &cldv, const View1D &cldvcu,
1145-
const View1D &cldvst, const View1D &rain) {
1143+
const View1D &cldst, const haero::ConstColumnView &evapr,
1144+
const haero::ConstColumnView &prain, const View1D &cldv,
1145+
const View1D &cldvcu, const View1D &cldvst, const View1D &rain) {
11461146
// Calculate local precipitation production rate
11471147
// In src/chemistry/aerosol/wetdep.F90, (prain + cmfdqr) is used for
11481148
// source_term
@@ -1231,27 +1231,23 @@ void cloud_diagnostics(const ThreadTeam &team,
12311231
// NOTE: The k loop inside clddiag cannot be converted to parallel_for
12321232
// because precabs requires values from the previous elevation (k-1).
12331233
Kokkos::single(Kokkos::PerTeam(team), [=]() {
1234-
wetdep::clddiag(nlev, temperature, pmid, pdel,
1235-
cmfdqr, evapc, cldt, cldcu,
1234+
wetdep::clddiag(nlev, temperature, pmid, pdel, cmfdqr, evapc, cldt, cldcu,
12361235
cldst, evapr, prain,
12371236
// outputs
12381237
cldv, cldvcu, cldvst, rain);
12391238
});
12401239
}
12411240
template <typename VectorIntType>
1242-
KOKKOS_INLINE_FUNCTION
1243-
void set_f_act(const ThreadTeam &team, VectorIntType& isprx,
1244-
const View1D &f_act_conv_coarse,
1245-
const View1D &f_act_conv_coarse_dust,
1246-
const View1D &f_act_conv_coarse_nacl,
1247-
haero::ConstColumnView pdel, haero::ConstColumnView prain,
1248-
const View1D &cmfdqr, const ConstView1D &evapr,
1249-
const View2D &state_q, const View2D &ptend_q, const Real dt,
1250-
const int nlev) {
1241+
KOKKOS_INLINE_FUNCTION void
1242+
set_f_act(const ThreadTeam &team, VectorIntType &isprx,
1243+
const View1D &f_act_conv_coarse, const View1D &f_act_conv_coarse_dust,
1244+
const View1D &f_act_conv_coarse_nacl, haero::ConstColumnView pdel,
1245+
haero::ConstColumnView prain, const View1D &cmfdqr,
1246+
const ConstView1D &evapr, const View2D &state_q,
1247+
const View2D &ptend_q, const Real dt, const int nlev) {
12511248

12521249
Kokkos::parallel_for(Kokkos::TeamVectorRange(team, nlev), [&](int k) {
1253-
isprx[k] = aero_model::examine_prec_exist(k, pdel, prain,
1254-
cmfdqr, evapr);
1250+
isprx[k] = aero_model::examine_prec_exist(k, pdel, prain, cmfdqr, evapr);
12551251

12561252
aero_model::set_f_act_coarse(k, state_q, ptend_q, dt, f_act_conv_coarse[k],
12571253
f_act_conv_coarse_dust[k],
@@ -1261,13 +1257,11 @@ void set_f_act(const ThreadTeam &team, VectorIntType& isprx,
12611257

12621258
// Computes lookup table for aerosol impaction/interception scavenging rates
12631259
template <typename VectorIntType>
1264-
KOKKOS_INLINE_FUNCTION
1265-
void modal_aero_bcscavcoef_get(const ThreadTeam &team, const Diagnostics &diags,
1266-
const VectorIntType& isprx, const View2D &scavimptblvol,
1267-
const View2D &scavimptblnum,
1268-
const View1D &scavcoefnum,
1269-
const View1D &scavcoefvol, const int imode,
1270-
const int nlev) {
1260+
KOKKOS_INLINE_FUNCTION void modal_aero_bcscavcoef_get(
1261+
const ThreadTeam &team, const Diagnostics &diags,
1262+
const VectorIntType &isprx, const View2D &scavimptblvol,
1263+
const View2D &scavimptblnum, const View1D &scavcoefnum,
1264+
const View1D &scavcoefvol, const int imode, const int nlev) {
12711265
Kokkos::parallel_for(Kokkos::TeamVectorRange(team, nlev), [&](int k) {
12721266
scavcoefnum[k] = scavcoefvol[k] = 0;
12731267
const bool let_it_rain = (isprx[k] == 1);
@@ -1284,14 +1278,11 @@ void modal_aero_bcscavcoef_get(const ThreadTeam &team, const Diagnostics &diags,
12841278

12851279
// Computes lookup table for aerosol impaction/interception scavenging rates
12861280
template <typename VectorIntType>
1287-
KOKKOS_INLINE_FUNCTION
1288-
void modal_aero_bcscavcoef_get(const ThreadTeam &team,
1289-
const View2D &wet_geometric_mean_diameter_i,
1290-
const VectorIntType & isprx, const View2D &scavimptblvol,
1291-
const View2D &scavimptblnum,
1292-
const View1D &scavcoefnum,
1293-
const View1D &scavcoefvol, const int imode,
1294-
const int nlev) {
1281+
KOKKOS_INLINE_FUNCTION void modal_aero_bcscavcoef_get(
1282+
const ThreadTeam &team, const View2D &wet_geometric_mean_diameter_i,
1283+
const VectorIntType &isprx, const View2D &scavimptblvol,
1284+
const View2D &scavimptblnum, const View1D &scavcoefnum,
1285+
const View1D &scavcoefvol, const int imode, const int nlev) {
12951286
Kokkos::parallel_for(Kokkos::TeamVectorRange(team, nlev), [&](int k) {
12961287
scavcoefnum[k] = scavcoefvol[k] = 0;
12971288
const bool let_it_rain = (isprx[k] == 1);
@@ -1317,9 +1308,8 @@ void define_act_frac(const ThreadTeam &team, const View1D &sol_facti,
13171308
});
13181309
}
13191310
template <typename VectorType>
1320-
KOKKOS_INLINE_FUNCTION
1321-
void compute_q_tendencies_phase_1(
1322-
Real &scavt, Real &bcscavt, Real &rcscavt, const VectorType& rtscavt_sv,
1311+
KOKKOS_INLINE_FUNCTION void compute_q_tendencies_phase_1(
1312+
Real &scavt, Real &bcscavt, Real &rcscavt, const VectorType &rtscavt_sv,
13231313
const Real f_act_conv, const Real scavcoefnum, const Real scavcoefvol,
13241314
const Real totcond, const Real cmfdqr, const Real conicw, const Real evapc,
13251315
const Real evapr, const Real prain, const Real dlf, const Real cldt,
@@ -1360,9 +1350,8 @@ void compute_q_tendencies_phase_1(
13601350
rtscavt_sv);
13611351
}
13621352
template <typename VectorType>
1363-
KOKKOS_INLINE_FUNCTION
1364-
void compute_q_tendencies_phase_2(
1365-
Real &scavt, Real &bcscavt, Real &rcscavt, const VectorType& rtscavt_sv,
1353+
KOKKOS_INLINE_FUNCTION void compute_q_tendencies_phase_2(
1354+
Real &scavt, Real &bcscavt, Real &rcscavt, const VectorType &rtscavt_sv,
13661355
const Real qqcw_tmp, const Real tracer,
13671356

13681357
// const Prognostics &progs,
@@ -1843,8 +1832,8 @@ void aero_model_wetdep(
18431832
mam4::water_uptake::modal_aero_water_uptake_dr(
18441833
// inputs
18451834
calcsizedata.nspec_amode, calcsizedata.specdens_amode,
1846-
calcsizedata.spechygro, calcsizedata.lspectype_amode,
1847-
state_q_kk, temperature(kk), pmid(kk), cldt(kk), dgnumdry_m_kk,
1835+
calcsizedata.spechygro, calcsizedata.lspectype_amode, state_q_kk,
1836+
temperature(kk), pmid(kk), cldt(kk), dgnumdry_m_kk,
18481837
// outputs
18491838
dgnumwet_m_kk, qaerwat_m_kk, wetdens_kk);
18501839
}

‎src/tests/mam4_wet_deposition_unit_tests.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,8 +202,7 @@ TEST_CASE("test_calculate_cloudy_volume", "mam4_wet_deposition_process") {
202202

203203
Kokkos::parallel_for(
204204
"test_calculate_cloudy_volume_true", 1, KOKKOS_LAMBDA(const int) {
205-
mam4::wetdep::calculate_cloudy_volume(nlev, cld, lprec, true,
206-
cldv);
205+
mam4::wetdep::calculate_cloudy_volume(nlev, cld, lprec, true, cldv);
207206
sumppr_all[0] = lprec[0];
208207
for (int i = 1; i < nlev; i++)
209208
sumppr_all[i] = sumppr_all[i - 1] + lprec[i];

‎src/validation/wetdep/calculate_cloudy_volume.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ void test_calculate_cloudy_volume_process(const Input &input, Output &output) {
5656
Kokkos::parallel_for(
5757
"wetdep::calculate_cloudy_volume", 1, KOKKOS_LAMBDA(const int) {
5858
auto lprec = [&](int i) { return lprec_dev[i]; };
59-
mam4::wetdep::calculate_cloudy_volume(nlev, cld_dev, lprec,
60-
is_tot_cld, cldv_dev);
59+
mam4::wetdep::calculate_cloudy_volume(nlev, cld_dev, lprec, is_tot_cld,
60+
cldv_dev);
6161

6262
sumppr_all_dev[0] = lprec_dev[0];
6363
for (int i = 1; i < nlev; i++)

‎src/validation/wetdep/wetdep_clddiag.cpp‎

Lines changed: 52 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -72,71 +72,69 @@ void test_wetdep_clddiag_process(const Input &input, Output &output) {
7272
using View1DHost = typename HostType::view_1d<Real>;
7373
using View1D = typename DeviceType::view_1d<Real>;
7474

75-
// For temperature
76-
View1DHost temperature_host((Real *)temperature.data(), pver);
77-
View1D temperature_arr("temperature", pver);
78-
Kokkos::deep_copy(temperature_arr, temperature_host);
79-
80-
// For pmid
81-
View1DHost pmid_host((Real *)pmid.data(), pver);
82-
View1D pmid_arr("pmid", pver);
83-
Kokkos::deep_copy(pmid_arr, pmid_host);
84-
85-
// For pdel
86-
View1DHost pdel_host((Real *)pdel.data(), pver);
87-
View1D pdel_arr("pdel", pver);
88-
Kokkos::deep_copy(pdel_arr, pdel_host);
89-
90-
// For cmfdqr
91-
View1DHost cmfdqr_host((Real *)cmfdqr.data(), pver);
92-
View1D cmfdqr_arr("cmfdqr", pver);
93-
Kokkos::deep_copy(cmfdqr_arr, cmfdqr_host);
94-
95-
// For evapc
96-
View1DHost evapc_host((Real *)evapc.data(), pver);
97-
View1D evapc_arr("evapc", pver);
98-
Kokkos::deep_copy(evapc_arr, evapc_host);
99-
100-
// For cldt
101-
View1DHost cldt_host((Real *)cldt.data(), pver);
102-
View1D cldt_arr("cldt", pver);
103-
Kokkos::deep_copy(cldt_arr, cldt_host);
104-
105-
// For cldcu
106-
View1DHost cldcu_host((Real *)cldcu.data(), pver);
107-
View1D cldcu_arr("cldcu", pver);
108-
Kokkos::deep_copy(cldcu_arr, cldcu_host);
109-
110-
// For cldst
111-
View1DHost cldst_host((Real *)cldst.data(), pver);
112-
View1D cldst_arr("cldst", pver);
113-
Kokkos::deep_copy(cldst_arr, cldst_host);
114-
115-
// For evapr
116-
View1DHost evapr_host((Real *)evapr.data(), pver);
117-
View1D evapr_arr("evapr", pver);
118-
Kokkos::deep_copy(evapr_arr, evapr_host);
119-
120-
// For prain
121-
View1DHost prain_host((Real *)prain.data(), pver);
122-
View1D prain_arr("prain", pver);
123-
Kokkos::deep_copy(prain_arr, prain_host);
124-
75+
// For temperature
76+
View1DHost temperature_host((Real *)temperature.data(), pver);
77+
View1D temperature_arr("temperature", pver);
78+
Kokkos::deep_copy(temperature_arr, temperature_host);
79+
80+
// For pmid
81+
View1DHost pmid_host((Real *)pmid.data(), pver);
82+
View1D pmid_arr("pmid", pver);
83+
Kokkos::deep_copy(pmid_arr, pmid_host);
84+
85+
// For pdel
86+
View1DHost pdel_host((Real *)pdel.data(), pver);
87+
View1D pdel_arr("pdel", pver);
88+
Kokkos::deep_copy(pdel_arr, pdel_host);
89+
90+
// For cmfdqr
91+
View1DHost cmfdqr_host((Real *)cmfdqr.data(), pver);
92+
View1D cmfdqr_arr("cmfdqr", pver);
93+
Kokkos::deep_copy(cmfdqr_arr, cmfdqr_host);
94+
95+
// For evapc
96+
View1DHost evapc_host((Real *)evapc.data(), pver);
97+
View1D evapc_arr("evapc", pver);
98+
Kokkos::deep_copy(evapc_arr, evapc_host);
99+
100+
// For cldt
101+
View1DHost cldt_host((Real *)cldt.data(), pver);
102+
View1D cldt_arr("cldt", pver);
103+
Kokkos::deep_copy(cldt_arr, cldt_host);
104+
105+
// For cldcu
106+
View1DHost cldcu_host((Real *)cldcu.data(), pver);
107+
View1D cldcu_arr("cldcu", pver);
108+
Kokkos::deep_copy(cldcu_arr, cldcu_host);
109+
110+
// For cldst
111+
View1DHost cldst_host((Real *)cldst.data(), pver);
112+
View1D cldst_arr("cldst", pver);
113+
Kokkos::deep_copy(cldst_arr, cldst_host);
114+
115+
// For evapr
116+
View1DHost evapr_host((Real *)evapr.data(), pver);
117+
View1D evapr_arr("evapr", pver);
118+
Kokkos::deep_copy(evapr_arr, evapr_host);
119+
120+
// For prain
121+
View1DHost prain_host((Real *)prain.data(), pver);
122+
View1D prain_arr("prain", pver);
123+
Kokkos::deep_copy(prain_arr, prain_host);
125124

126125
// Prepare device views for output arrays
127126
ColumnView cldv_dev = mam4::validation::create_column_view(pver);
128127
ColumnView cldvcu_dev = mam4::validation::create_column_view(pver);
129128
ColumnView cldvst_dev = mam4::validation::create_column_view(pver);
130129
ColumnView rain_dev = mam4::validation::create_column_view(pver);
131130

132-
//TODO: let's use team policy
131+
// TODO: let's use team policy
133132
Kokkos::parallel_for(
134133
"wetdep::clddiag", 1, KOKKOS_LAMBDA(const int) {
135-
136134
mam4::wetdep::clddiag(pver, temperature_arr, pmid_arr, pdel_arr,
137135
cmfdqr_arr, evapc_arr, cldt_arr, cldcu_arr,
138-
cldst_arr, evapr_arr, prain_arr, cldv_dev, cldvcu_dev,
139-
cldvst_dev, rain_dev);
136+
cldst_arr, evapr_arr, prain_arr, cldv_dev,
137+
cldvcu_dev, cldvst_dev, rain_dev);
140138
});
141139

142140
// Create mirror views for output arrays

0 commit comments

Comments
 (0)