ordering state parameters

NCAR · Oct 23, 2023 · c203293 · c203293
1 parent 8a4307c
commit c203293
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/test/integration/e5.hpp b/test/integration/e5.hpp
@@ -45,12 +45,12 @@ class E5 : public micm::RosenbrockSolver<MatrixPolicy, SparseMatrixPolicy, Linea
 
     std::function<std::string(const std::vector<std::string>& variables, const std::size_t i)> state_reordering;    
     this->state_parameters_ = {
-      .variable_names_ = system.UniqueNames(state_reordering),
-      .jacobian_diagonal_elements_ = jacobian_diagonal_elements,
-      .custom_rate_parameter_labels_ = param_labels,
       .number_of_grid_cells_ = 1,
       .number_of_rate_constants_ = processes.size(),
-      .nonzero_jacobian_elements_ = nonzero_jacobian_elements
+      .variable_names_ = system.UniqueNames(state_reordering),
+      .custom_rate_parameter_labels_ = param_labels,
+      .nonzero_jacobian_elements_ = nonzero_jacobian_elements,
+      .jacobian_diagonal_elements_ = jacobian_diagonal_elements,
     };
 
     this->linear_solver_ = LinearSolverPolicy(jacobian, 1.0e-30);

diff --git a/test/integration/hires.hpp b/test/integration/hires.hpp
@@ -46,12 +46,12 @@ class HIRES : public micm::RosenbrockSolver<MatrixPolicy, SparseMatrixPolicy, Li
 
     std::function<std::string(const std::vector<std::string>& variables, const std::size_t i)> state_reordering;
     this->state_parameters_ = {
-      .variable_names_ = system.UniqueNames(state_reordering),
-      .jacobian_diagonal_elements_ = jacobian_diagonal_elements,
-      .custom_rate_parameter_labels_ = param_labels,
       .number_of_grid_cells_ = 1,
       .number_of_rate_constants_ = processes.size(),
-      .nonzero_jacobian_elements_ = nonzero_jacobian_elements
+      .variable_names_ = system.UniqueNames(state_reordering),
+      .custom_rate_parameter_labels_ = param_labels,
+      .nonzero_jacobian_elements_ = nonzero_jacobian_elements,
+      .jacobian_diagonal_elements_ = jacobian_diagonal_elements,
     };
 
     this->linear_solver_ = LinearSolverPolicy(jacobian, 1.0e-30);

diff --git a/test/integration/oregonator.hpp b/test/integration/oregonator.hpp
@@ -46,12 +46,12 @@ class Oregonator : public micm::RosenbrockSolver<MatrixPolicy, SparseMatrixPolic
 
     std::function<std::string(const std::vector<std::string>& variables, const std::size_t i)> state_reordering;
     this->state_parameters_ = {
-      .variable_names_ = system.UniqueNames(state_reordering),
-      .jacobian_diagonal_elements_ = jacobian_diagonal_elements,
-      .custom_rate_parameter_labels_ = param_labels,
       .number_of_grid_cells_ = 1,
       .number_of_rate_constants_ = processes.size(),
-      .nonzero_jacobian_elements_ = nonzero_jacobian_elements
+      .variable_names_ = system.UniqueNames(state_reordering),
+      .custom_rate_parameter_labels_ = param_labels,
+      .nonzero_jacobian_elements_ = nonzero_jacobian_elements,
+      .jacobian_diagonal_elements_ = jacobian_diagonal_elements,
     };
 
     this->linear_solver_ = LinearSolverPolicy(jacobian, 1.0e-30);