Fixed multi-instance behavior with matchstep option, formatting.

ORNL-Fusion · Jan 13, 2025 · f36302e · f36302e
1 parent 5d6964c
commit f36302e
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 34 deletions.
diff --git a/xolotl/core/include/xolotl/core/network/AlloyTraits.h b/xolotl/core/include/xolotl/core/network/AlloyTraits.h
@@ -45,8 +45,7 @@ toNameString(AlloySpecies species)
 }
 
 template <>
-struct NumberOfSpecies<AlloySpecies> :
-	std::integral_constant<std::size_t, 6>
+struct NumberOfSpecies<AlloySpecies> : std::integral_constant<std::size_t, 6>
 {
 };
 

diff --git a/xolotl/core/include/xolotl/core/network/impl/SinkReaction.tpp b/xolotl/core/include/xolotl/core/network/impl/SinkReaction.tpp
@@ -12,8 +12,7 @@ namespace core
 namespace network
 {
 template <typename TNetwork, typename TDerived>
-KOKKOS_FUNCTION
-double
+KOKKOS_FUNCTION double
 SinkReaction<TNetwork, TDerived>::computeRate(IndexType gridIndex, double time)
 {
 	auto cl = this->_clusterData->getCluster(_reactant);

diff --git a/xolotl/interface/src/Interface.cpp b/xolotl/interface/src/Interface.cpp
@@ -18,9 +18,9 @@ makeXolotlInterface(int& argc, const char* argv[])
 
 	// Get options
 	auto options = options::createOptions(argc, argv);
-    if (!options) {
-        return std::unique_ptr<IXolotlInterface>();
-    }
+	if (!options) {
+		return std::unique_ptr<IXolotlInterface>();
+	}
 	options->readParams(argc, argv);
 
 	// Create instance(s)

diff --git a/xolotl/interface/src/MultiXolotl.cpp b/xolotl/interface/src/MultiXolotl.cpp
@@ -365,6 +365,10 @@ MultiXolotl::updateTemperaturesAndRates(
 void
 MultiXolotl::solveStep()
 {
+	// Skip the first timestep because it doesn't do anything
+	if (currentTime() == 0.0)
+		return;
+
 	// Transfer the temperature to the full network
 	auto subInstanceData = getSubInstanceData();
 	// 0D

diff --git a/xolotl/options/include/xolotl/options/CommandLineError.h b/xolotl/options/include/xolotl/options/CommandLineError.h
@@ -9,7 +9,7 @@ namespace options
 class CommandLineError : public std::runtime_error
 {
 public:
-    using std::runtime_error::runtime_error;
+	using std::runtime_error::runtime_error;
 };
-}
-}
+} // namespace options
+} // namespace xolotl
diff --git a/xolotl/util/include/xolotl/util/GrowthFactorStepSequence.h b/xolotl/util/include/xolotl/util/GrowthFactorStepSequence.h
@@ -22,11 +22,11 @@ class GrowthFactorStepSequence : public StepSequence
 	void
 	step() override;
 
-    double
-    startValue() const noexcept override
-    {
-        return _initialValue;
-    }
+	double
+	startValue() const noexcept override
+	{
+		return _initialValue;
+	}
 
 	double
 	at(std::size_t step) const override;

diff --git a/xolotl/util/include/xolotl/util/TimeStepper.h b/xolotl/util/include/xolotl/util/TimeStepper.h
@@ -48,17 +48,17 @@ class TimeStepper
 		return _currentTime;
 	}
 
-    [[nodiscard]] double
-    startTime() const noexcept
-    {
-        return _startTime;
-    }
-
-    [[nodiscard]] double
-    startTimeStepSize() const noexcept
-    {
-        return _seq->startValue();
-    }
+	[[nodiscard]] double
+	startTime() const noexcept
+	{
+		return _startTime;
+	}
+
+	[[nodiscard]] double
+	startTimeStepSize() const noexcept
+	{
+		return _seq->startValue();
+	}
 
 	[[nodiscard]] double
 	previousTime() const noexcept

diff --git a/xolotl/util/include/xolotl/util/TupleUtils.h b/xolotl/util/include/xolotl/util/TupleUtils.h
@@ -16,7 +16,7 @@ struct TuplePushFrontHelper<T, std::tuple<Ts...>>
 {
 	using Type = std::tuple<T, Ts...>;
 };
-}
+} // namespace detail
 
 template <typename TTuple, typename T>
 using TuplePushFront = typename detail::TuplePushFrontHelper<T, TTuple>::Type;
@@ -29,15 +29,15 @@ struct TuplePopFrontHelper;
 template <>
 struct TuplePopFrontHelper<std::tuple<>>
 {
-    using Type = std::tuple<>;
+	using Type = std::tuple<>;
 };
 
 template <typename T, typename... Ts>
 struct TuplePopFrontHelper<std::tuple<T, Ts...>>
 {
 	using Type = std::tuple<Ts...>;
 };
-}
+} // namespace detail
 
 template <typename TTuple>
 using TuplePopFront = typename detail::TuplePopFrontHelper<TTuple>::Type;
@@ -52,7 +52,7 @@ struct TuplePushBackHelper<std::tuple<Ts...>, T>
 {
 	using Type = std::tuple<Ts..., T>;
 };
-}
+} // namespace detail
 
 template <typename TTuple, typename T>
 using TuplePushBack = typename detail::TuplePushBackHelper<TTuple, T>::Type;
@@ -65,7 +65,7 @@ struct TuplePopBackHelper;
 template <>
 struct TuplePopBackHelper<std::tuple<>>
 {
-    using Type = std::tuple<>;
+	using Type = std::tuple<>;
 };
 
 template <typename T>
@@ -80,7 +80,7 @@ struct TuplePopBackHelper<std::tuple<T, Ts...>>
 	using Type =
 		TuplePushFront<typename TuplePopBackHelper<std::tuple<Ts...>>::Type, T>;
 };
-}
+} // namespace detail
 
 template <typename TTuple>
 using TuplePopBack = typename detail::TuplePopBackHelper<TTuple>::Type;
@@ -102,7 +102,7 @@ struct TupleReverseHelper<std::tuple<T, Ts...>>
 	using Type =
 		TuplePushBack<typename TupleReverseHelper<std::tuple<Ts...>>::Type, T>;
 };
-}
+} // namespace detail
 
 template <typename TTuple>
 using TupleReverse = typename detail::TupleReverseHelper<TTuple>::Type;
@@ -117,7 +117,7 @@ struct TupleApplyAllHelper<Tpl, std::tuple<Ts...>>
 {
 	using Type = Tpl<Ts...>;
 };
-}
+} // namespace detail
 
 template <template <typename...> typename Tpl, typename TTuple>
 using TupleApplyAll = typename detail::TupleApplyAllHelper<Tpl, TTuple>::Type;