commit 3a820196ce5f6b1062ec367b9b575eb05b65ffdf
parent b58a05c534fcde3d20c42bd89df907734542d147
Author: Fabian Wermelinger <fabianw@mavt.ethz.ch>
Date: Mon, 1 Feb 2021 00:22:36 +0100
Fix include paths
Diffstat:
9 files changed, 20 insertions(+), 17 deletions(-)
diff --git a/include/ArgumentParser.h b/include/ArgumentParser.h
@@ -13,8 +13,9 @@
* Copyright 2010 ETH Zurich. All rights reserved.
*
*/
+#ifndef ARGUMENTPARSER_H_F1A35U8A
+#define ARGUMENTPARSER_H_F1A35U8A
-#pragma once
#include <cstdio>
#include <cstdlib>
#include <cstring>
@@ -375,3 +376,5 @@ public:
}
}
};
+
+#endif /* ARGUMENTPARSER_H_F1A35U8A */
diff --git a/include/TimeStepper/StepperBase.h b/include/TimeStepper/StepperBase.h
@@ -6,7 +6,7 @@
#ifndef STEPPERBASE_H_FCCSM4HL
#define STEPPERBASE_H_FCCSM4HL
-#include <TimeStepper/KernelBase.h>
+#include <ODE/TimeStepper/KernelBase.h>
#include <cassert>
#include <iostream>
diff --git a/include/TimeStepper/TimeStepper.h b/include/TimeStepper/TimeStepper.h
@@ -6,17 +6,17 @@
#ifndef TIMESTEPPER_H_XFR2JEZJ
#define TIMESTEPPER_H_XFR2JEZJ
-#include <ArgumentParser.h>
-#include <TimeStepper/KernelBase.h>
-#include <TimeStepper/StepperBase.h>
+#include <ODETB/ArgumentParser.h>
+#include <ODETB/TimeStepper/KernelBase.h>
+#include <ODETB/TimeStepper/StepperBase.h>
-#include <TimeStepper/explicit/Euler.h>
-#include <TimeStepper/explicit/LSRK3.h>
-#include <TimeStepper/explicit/RK4.h>
-#include <TimeStepper/explicit/variableStep/RKF45.h>
-#include <TimeStepper/explicit/variableStep/RKV56.h>
+#include <ODETB/TimeStepper/explicit/Euler.h>
+#include <ODETB/TimeStepper/explicit/LSRK3.h>
+#include <ODETB/TimeStepper/explicit/RK4.h>
+#include <ODETB/TimeStepper/explicit/variableStep/RKF45.h>
+#include <ODETB/TimeStepper/explicit/variableStep/RKV56.h>
#ifdef _USE_SUNDIALS_
-#include <TimeStepper/implicit/BDF.h>
+#include <ODETB/TimeStepper/implicit/BDF.h>
#endif /* _USE_SUNDIALS_ */
#include <cstdio>
diff --git a/include/TimeStepper/explicit/Euler.h b/include/TimeStepper/explicit/Euler.h
@@ -6,7 +6,7 @@
#ifndef EULER_H_8R2CXYR0
#define EULER_H_8R2CXYR0
-#include <TimeStepper/StepperBase.h>
+#include <ODETB/TimeStepper/StepperBase.h>
#include <cstdio>
diff --git a/include/TimeStepper/explicit/LSRK3.h b/include/TimeStepper/explicit/LSRK3.h
@@ -6,7 +6,7 @@
#ifndef LSRK3_H_MJ6ACLH4
#define LSRK3_H_MJ6ACLH4
-#include <TimeStepper/explicit/Euler.h>
+#include <ODETB/TimeStepper/explicit/Euler.h>
template <typename Tinput, typename Trhs>
class LSRK3 : public Euler<Tinput, Trhs>
diff --git a/include/TimeStepper/explicit/RK4.h b/include/TimeStepper/explicit/RK4.h
@@ -6,7 +6,7 @@
#ifndef RK4_H_LROUVHDE
#define RK4_H_LROUVHDE
-#include <TimeStepper/explicit/Euler.h>
+#include <ODETB/TimeStepper/explicit/Euler.h>
template <typename Tinput, typename Trhs>
class RK4 : public Euler<Tinput, Trhs>
diff --git a/include/TimeStepper/explicit/variableStep/RKF45.h b/include/TimeStepper/explicit/variableStep/RKF45.h
@@ -6,7 +6,7 @@
#ifndef RKF45_H_UWN6WM1V
#define RKF45_H_UWN6WM1V
-#include <TimeStepper/explicit/Euler.h>
+#include <ODETB/TimeStepper/explicit/Euler.h>
#include <cassert>
#include <cmath>
diff --git a/include/TimeStepper/explicit/variableStep/RKV56.h b/include/TimeStepper/explicit/variableStep/RKV56.h
@@ -6,7 +6,7 @@
#ifndef RKV56_H_A6VN39JN
#define RKV56_H_A6VN39JN
-#include <TimeStepper/explicit/Euler.h>
+#include <ODETB/TimeStepper/explicit/Euler.h>
#include <cassert>
#include <cmath>
diff --git a/include/TimeStepper/implicit/BDF.h b/include/TimeStepper/implicit/BDF.h
@@ -7,7 +7,7 @@
#define BDF_H_YF523CRX
#ifdef _USE_SUNDIALS_
-#include <TimeStepper/StepperBase.h>
+#include <ODETB/TimeStepper/StepperBase.h>
#include <cvode/cvode.h>
#include <cvode/cvode_dense.h>