Skip to content

Commit 4dda8ca

Browse files
actions-useractions-user
committed
Auto-format code using Clang-Format
1 parent 6339193 commit 4dda8ca

9 files changed

Lines changed: 34 additions & 75 deletions

‎include/micm/solver/external_model_dispatcher.hpp‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,16 +48,14 @@ namespace micm
4848
void AddForcingTerms(const State& state, const DenseMatrixPolicy& Y, DenseMatrixPolicy& forcing) const
4949
{
5050
inner_.AddForcingTerms(state, Y, forcing);
51-
InvokeProcesses([&](const auto& m)
52-
{ m.AddForcingTerms(state.custom_rate_parameters_, Y, forcing); });
51+
InvokeProcesses([&](const auto& m) { m.AddForcingTerms(state.custom_rate_parameters_, Y, forcing); });
5352
}
5453

5554
template<class State, class DenseMatrixPolicy, class SparseMatrixPolicy>
5655
void SubtractJacobianTerms(const State& state, const DenseMatrixPolicy& Y, SparseMatrixPolicy& jacobian) const
5756
{
5857
inner_.SubtractJacobianTerms(state, Y, jacobian);
59-
InvokeProcesses([&](const auto& m)
60-
{ m.SubtractJacobianTerms(state.custom_rate_parameters_, Y, jacobian); });
58+
InvokeProcesses([&](const auto& m) { m.SubtractJacobianTerms(state.custom_rate_parameters_, Y, jacobian); });
6159
}
6260

6361
/// @brief Called before each solve to refresh temperature-/pressure-dependent parameters.
@@ -169,8 +167,7 @@ namespace micm
169167
SparseMatrixPolicy& jacobian) const
170168
{
171169
inner_.SubtractJacobianTerms(state_variables, state_parameters, jacobian);
172-
InvokeConstraints([&](const auto& m)
173-
{ m.SubtractConstraintJacobian(state_parameters, state_variables, jacobian); });
170+
InvokeConstraints([&](const auto& m) { m.SubtractConstraintJacobian(state_parameters, state_variables, jacobian); });
174171
}
175172

176173
template<class DenseMatrixPolicy>

‎include/micm/solver/solver.hpp‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -174,9 +174,7 @@ namespace micm
174174
{
175175
// External process-model parameter updates must run first: they populate
176176
// custom_rate_parameters_ which user-defined and surface rate constants read.
177-
if constexpr (requires {
178-
solver_.rates_.UpdateStateParameters(state.conditions_, state.custom_rate_parameters_);
179-
})
177+
if constexpr (requires { solver_.rates_.UpdateStateParameters(state.conditions_, state.custom_rate_parameters_); })
180178
{
181179
solver_.rates_.UpdateStateParameters(state.conditions_, state.custom_rate_parameters_);
182180
}

‎include/micm/solver/solver_builder.hpp‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@ namespace micm
102102
}
103103

104104
public:
105-
106105
/// @brief Set the chemical system
107106
/// @param system The chemical system
108107
/// @return Updated SolverBuilder
@@ -177,8 +176,7 @@ namespace micm
177176
StatePolicy,
178177
ExternalModels...,
179178
ExternalModel>;
180-
auto extended_models =
181-
std::tuple_cat(std::move(external_models_), std::tuple<ExternalModel>(std::move(model)));
179+
auto extended_models = std::tuple_cat(std::move(external_models_), std::tuple<ExternalModel>(std::move(model)));
182180
NextBuilder next(options_, std::move(extended_models));
183181
next.system_ = std::move(system_);
184182
next.reactions_ = std::move(reactions_);
@@ -197,8 +195,7 @@ namespace micm
197195
}
198196
if constexpr (HasProcesses<ExternalModel>)
199197
{
200-
next.external_process_sets_.emplace_back(
201-
ExternalModelProcessSet<DenseMatrixPolicy, SparseMatrixPolicy>{ appended });
198+
next.external_process_sets_.emplace_back(ExternalModelProcessSet<DenseMatrixPolicy, SparseMatrixPolicy>{ appended });
202199
}
203200
if constexpr (HasConstraints<ExternalModel>)
204201
{

‎test/integration/kokkos/test_kokkos_aerosol_model_backward_euler.cpp‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
// SPDX-License-Identifier: Apache-2.0
33
#include "../aerosol_model_policy.hpp"
44

5-
#include <micm/util/types.hpp>
65
#include <micm/Kokkos.hpp>
6+
#include <micm/util/types.hpp>
77

88
#include <gtest/gtest.h>
99

@@ -45,7 +45,8 @@ using VectorBackwardEulerMozartCSC = micm::CpuSolverBuilder<
4545
micm::BackwardEulerSolverParameters,
4646
micm::KokkosDenseMatrix<micm::Real, L>,
4747
micm::KokkosSparseMatrix<micm::Real, micm::SparseMatrixVectorOrderingCompressedSparseColumn<L>>,
48-
micm::LuDecompositionMozart<micm::KokkosSparseMatrix<micm::Real, micm::SparseMatrixVectorOrderingCompressedSparseColumn<L>>>>;
48+
micm::LuDecompositionMozart<
49+
micm::KokkosSparseMatrix<micm::Real, micm::SparseMatrixVectorOrderingCompressedSparseColumn<L>>>>;
4950

5051
template<micm::Index L>
5152
using VectorBackwardEulerDoolittleInPlace = micm::CpuSolverBuilderInPlace<

‎test/integration/kokkos/test_kokkos_aerosol_model_rosenbrock.cpp‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
// SPDX-License-Identifier: Apache-2.0
33
#include "../aerosol_model_policy.hpp"
44

5-
#include <micm/util/types.hpp>
65
#include <micm/Kokkos.hpp>
6+
#include <micm/util/types.hpp>
77

88
#include <gtest/gtest.h>
99

@@ -45,7 +45,8 @@ using VectorRosenbrockMozartCSC = micm::CpuSolverBuilder<
4545
micm::RosenbrockSolverParameters,
4646
micm::KokkosDenseMatrix<micm::Real, L>,
4747
micm::KokkosSparseMatrix<micm::Real, micm::SparseMatrixVectorOrderingCompressedSparseColumn<L>>,
48-
micm::LuDecompositionMozart<micm::KokkosSparseMatrix<micm::Real, micm::SparseMatrixVectorOrderingCompressedSparseColumn<L>>>>;
48+
micm::LuDecompositionMozart<
49+
micm::KokkosSparseMatrix<micm::Real, micm::SparseMatrixVectorOrderingCompressedSparseColumn<L>>>>;
4950

5051
#ifdef JUST_ONE_SOLVER
5152
auto rosenbrock = micm::KokkosSolverBuilder<micm::RosenbrockSolverParameters>(

‎test/integration/kokkos/test_kokkos_external_model_constraints.cpp‎

Lines changed: 9 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -230,12 +230,7 @@ class ConservativeEquilibriumConstraintModel
230230
const typename DenseMatrixPolicy::ViewType& forcing_view,
231231
const typename DenseMatrixPolicy::ConstViewType& state_view) {
232232
forcing_view.ForEachRow(
233-
[K, total](
234-
micm::Real& f_b,
235-
micm::Real& f_c,
236-
const micm::Real& a,
237-
const micm::Real& b,
238-
const micm::Real& c)
233+
[K, total](micm::Real& f_b, micm::Real& f_c, const micm::Real& a, const micm::Real& b, const micm::Real& c)
239234
{
240235
f_b = a + b + c - total;
241236
f_c = K * b - c;
@@ -265,12 +260,7 @@ class ConservativeEquilibriumConstraintModel
265260
SparseMatrixPolicy::Function(
266261
MICM_LAMBDA(const typename SparseMatrixPolicy::ViewType& jacobian_view) {
267262
jacobian_view.ForEachBlock(
268-
[K](
269-
micm::Real& j_ba,
270-
micm::Real& j_bb,
271-
micm::Real& j_bc,
272-
micm::Real& j_cb,
273-
micm::Real& j_cc)
263+
[K](micm::Real& j_ba, micm::Real& j_bb, micm::Real& j_bc, micm::Real& j_cb, micm::Real& j_cc)
274264
{
275265
j_ba -= 1.0;
276266
j_bb -= 1.0;
@@ -394,9 +384,7 @@ class MassConservationModel
394384
for (auto idx : indices)
395385
{
396386
state_view.ForEachRow(
397-
[](micm::Real& s, const micm::Real& v) { s += v; },
398-
sum,
399-
state_view.GetConstColumnView(idx));
387+
[](micm::Real& s, const micm::Real& v) { s += v; }, sum, state_view.GetConstColumnView(idx));
400388
}
401389
forcing_view.ForEachRow(
402390
[](micm::Real& f, const micm::Real& s) { f = s; }, forcing_view.GetColumnView(i_ctrl), sum);
@@ -419,8 +407,7 @@ class MassConservationModel
419407
MICM_LAMBDA(const typename SparseMatrixPolicy::ViewType& jacobian_view) {
420408
for (auto flat : flat_ids)
421409
{
422-
jacobian_view.ForEachBlock(
423-
[](micm::Real& j) { j -= 1.0; }, jacobian_view.GetBlockView(flat));
410+
jacobian_view.ForEachBlock([](micm::Real& j) { j -= 1.0; }, jacobian_view.GetBlockView(flat));
424411
}
425412
},
426413
jacobian)(jacobian);
@@ -1317,7 +1304,8 @@ TEST(ExternalModelFiniteDifferenceJacobian, ProcessForcingJacobian)
13171304
<< " row=" << comparison.worst_row_ << " col=" << comparison.worst_col_
13181305
<< " analytical=" << comparison.worst_analytical_ << " fd=" << comparison.worst_fd_;
13191306

1320-
auto sparsity = micm::CheckJacobianSparsityCompleteness<FdDenseMatrix, SparseMatrixFD>(analytical_jac, fd_jac, num_species);
1307+
auto sparsity =
1308+
micm::CheckJacobianSparsityCompleteness<FdDenseMatrix, SparseMatrixFD>(analytical_jac, fd_jac, num_species);
13211309

13221310
EXPECT_TRUE(sparsity.passed_) << "Missing sparsity at block=" << sparsity.worst_block_ << " row=" << sparsity.worst_row_
13231311
<< " col=" << sparsity.worst_col_ << " fd_value=" << sparsity.worst_fd_;
@@ -1405,7 +1393,8 @@ TEST(ExternalModelFiniteDifferenceJacobian, EquilibriumConstraintModelJacobian)
14051393
<< " row=" << comparison.worst_row_ << " col=" << comparison.worst_col_
14061394
<< " analytical=" << comparison.worst_analytical_ << " fd=" << comparison.worst_fd_;
14071395

1408-
auto sparsity = micm::CheckJacobianSparsityCompleteness<FdDenseMatrix, SparseMatrixFD>(analytical_jac, fd_jac, num_species);
1396+
auto sparsity =
1397+
micm::CheckJacobianSparsityCompleteness<FdDenseMatrix, SparseMatrixFD>(analytical_jac, fd_jac, num_species);
14091398

14101399
EXPECT_TRUE(sparsity.passed_) << "Missing sparsity at block=" << sparsity.worst_block_ << " row=" << sparsity.worst_row_
14111400
<< " col=" << sparsity.worst_col_ << " fd_value=" << sparsity.worst_fd_;
@@ -1512,8 +1501,7 @@ class TemperatureDependentEquilibriumModel
15121501
const typename DenseMatrixPolicy::ConstViewType& params_view,
15131502
const typename DenseMatrixPolicy::ConstViewType& state_view) {
15141503
forcing_view.ForEachRow(
1515-
[](micm::Real& f_p, const micm::Real& K, const micm::Real& r, const micm::Real& p)
1516-
{ f_p = K * r - p; },
1504+
[](micm::Real& f_p, const micm::Real& K, const micm::Real& r, const micm::Real& p) { f_p = K * r - p; },
15171505
forcing_view.GetColumnView(i_p),
15181506
params_view.GetConstColumnView(i_K),
15191507
state_view.GetConstColumnView(i_r),

‎test/integration/stub_aerosol_2.hpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,7 @@ class AnotherStubAerosolModel
134134
auto ri = state_variable_indices.find(r);
135135
auto pi = state_variable_indices.find(p);
136136
auto pri = state_parameter_indices.find(param);
137-
if (ri != state_variable_indices.end() && pi != state_variable_indices.end() &&
138-
pri != state_parameter_indices.end())
137+
if (ri != state_variable_indices.end() && pi != state_variable_indices.end() && pri != state_parameter_indices.end())
139138
{
140139
forcing_info_.push_back({ ri->second,
141140
pi->second,

‎test/integration/stub_aerosol_with_constraints.hpp‎

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,8 @@ class StubAerosolWithConstraints
8282
}
8383

8484
template<class DenseMatrixPolicy>
85-
void UpdateStateParameters(
86-
const typename DenseMatrixPolicy::template VectorType<micm::Conditions>&,
87-
DenseMatrixPolicy&) const
85+
void UpdateStateParameters(const typename DenseMatrixPolicy::template VectorType<micm::Conditions>&, DenseMatrixPolicy&)
86+
const
8887
{
8988
}
9089

@@ -326,9 +325,8 @@ class StubAerosolWithSolvent
326325
}
327326

328327
template<class DenseMatrixPolicy>
329-
void UpdateStateParameters(
330-
const typename DenseMatrixPolicy::template VectorType<micm::Conditions>&,
331-
DenseMatrixPolicy&) const
328+
void UpdateStateParameters(const typename DenseMatrixPolicy::template VectorType<micm::Conditions>&, DenseMatrixPolicy&)
329+
const
332330
{
333331
}
334332

@@ -347,11 +345,7 @@ class StubAerosolWithSolvent
347345
const typename DenseMatrixPolicy::ViewType& forcing_view,
348346
const typename DenseMatrixPolicy::ConstViewType& state_view) {
349347
forcing_view.ForEachRow(
350-
[k](
351-
micm::Real& f_gas,
352-
micm::Real& f_aq,
353-
const micm::Real& gas_val,
354-
const micm::Real& s_val)
348+
[k](micm::Real& f_gas, micm::Real& f_aq, const micm::Real& gas_val, const micm::Real& s_val)
355349
{
356350
micm::Real rate = k * gas_val * s_val;
357351
f_gas -= rate;
@@ -384,8 +378,7 @@ class StubAerosolWithSolvent
384378
const typename SparseMatrixPolicy::ViewType& jacobian_view,
385379
const typename DenseMatrixPolicy::ConstViewType& state_view) {
386380
jacobian_view.ForEachBlock(
387-
[k](
388-
micm::Real& j_gg,
381+
[k](micm::Real& j_gg,
389382
micm::Real& j_gs,
390383
micm::Real& j_ag,
391384
micm::Real& j_as,

‎test/integration/test_external_model_constraints.cpp‎

Lines changed: 6 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -230,12 +230,7 @@ class ConservativeEquilibriumConstraintModel
230230
const typename DenseMatrixPolicy::ViewType& forcing_view,
231231
const typename DenseMatrixPolicy::ConstViewType& state_view) {
232232
forcing_view.ForEachRow(
233-
[K, total](
234-
micm::Real& f_b,
235-
micm::Real& f_c,
236-
const micm::Real& a,
237-
const micm::Real& b,
238-
const micm::Real& c)
233+
[K, total](micm::Real& f_b, micm::Real& f_c, const micm::Real& a, const micm::Real& b, const micm::Real& c)
239234
{
240235
f_b = a + b + c - total;
241236
f_c = K * b - c;
@@ -265,12 +260,7 @@ class ConservativeEquilibriumConstraintModel
265260
SparseMatrixPolicy::Function(
266261
MICM_LAMBDA(const typename SparseMatrixPolicy::ViewType& jacobian_view) {
267262
jacobian_view.ForEachBlock(
268-
[K](
269-
micm::Real& j_ba,
270-
micm::Real& j_bb,
271-
micm::Real& j_bc,
272-
micm::Real& j_cb,
273-
micm::Real& j_cc)
263+
[K](micm::Real& j_ba, micm::Real& j_bb, micm::Real& j_bc, micm::Real& j_cb, micm::Real& j_cc)
274264
{
275265
j_ba -= 1.0;
276266
j_bb -= 1.0;
@@ -393,9 +383,7 @@ class MassConservationModel
393383
for (auto idx : indices)
394384
{
395385
state_view.ForEachRow(
396-
[](micm::Real& s, const micm::Real& v) { s += v; },
397-
sum,
398-
state_view.GetConstColumnView(idx));
386+
[](micm::Real& s, const micm::Real& v) { s += v; }, sum, state_view.GetConstColumnView(idx));
399387
}
400388
forcing_view.ForEachRow(
401389
[](micm::Real& f, const micm::Real& s) { f = s; }, forcing_view.GetColumnView(i_ctrl), sum);
@@ -417,8 +405,7 @@ class MassConservationModel
417405
MICM_LAMBDA(const typename SparseMatrixPolicy::ViewType& jacobian_view) {
418406
for (auto flat : flat_ids)
419407
{
420-
jacobian_view.ForEachBlock(
421-
[](micm::Real& j) { j -= 1.0; }, jacobian_view.GetBlockView(flat));
408+
jacobian_view.ForEachBlock([](micm::Real& j) { j -= 1.0; }, jacobian_view.GetBlockView(flat));
422409
}
423410
},
424411
jacobian)(jacobian);
@@ -1350,8 +1337,7 @@ TEST(ExternalModelFiniteDifferenceJacobian, ProcessForcingJacobian)
13501337

13511338
aerosol.SubtractJacobianTerms(params, variables, analytical_jac);
13521339

1353-
auto fd_wrapper = [&](const DenseMatrix& vars, DenseMatrix& forcing)
1354-
{ aerosol.AddForcingTerms(params, vars, forcing); };
1340+
auto fd_wrapper = [&](const DenseMatrix& vars, DenseMatrix& forcing) { aerosol.AddForcingTerms(params, vars, forcing); };
13551341

13561342
auto fd_jac = micm::FiniteDifferenceJacobian<DenseMatrix>(fd_wrapper, variables, num_species);
13571343

@@ -1557,8 +1543,7 @@ class TemperatureDependentEquilibriumModel
15571543
const typename DenseMatrixPolicy::ConstViewType& params_view,
15581544
const typename DenseMatrixPolicy::ConstViewType& state_view) {
15591545
forcing_view.ForEachRow(
1560-
[](micm::Real& f_p, const micm::Real& K, const micm::Real& r, const micm::Real& p)
1561-
{ f_p = K * r - p; },
1546+
[](micm::Real& f_p, const micm::Real& K, const micm::Real& r, const micm::Real& p) { f_p = K * r - p; },
15621547
forcing_view.GetColumnView(i_p),
15631548
params_view.GetConstColumnView(i_K),
15641549
state_view.GetConstColumnView(i_r),

0 commit comments

Comments
 (0)