Commit ffea0ed2 authored by Chris Cantwell's avatar Chris Cantwell

Cleaning up code comments and cout statements.

parent 8febd4b5
Pipeline #1254 failed with stage
in 0 seconds
#pragma once
///////////////////////////////////////////////////////////////////////////////
//
// File: AdamsBashforthTimeIntegrationSchemes.h
......@@ -36,20 +34,14 @@
//
///////////////////////////////////////////////////////////////////////////////
#define LUE LIB_UTILITIES_EXPORT
#pragma once
///////////////////////////////////////////////////////////////////////////////
#define LUE LIB_UTILITIES_EXPORT
#include <LibUtilities/TimeIntegration/TimeIntegrationScheme.h>
#include <LibUtilities/TimeIntegration/EulerTimeIntegrationSchemes.h>
#include <LibUtilities/TimeIntegration/RungeKuttaTimeIntegrationSchemes.h>
///////////////////////////////////////////////////////////////////////////////
// For debugging:
#include <iostream>
namespace Nektar
{
namespace LibUtilities
......@@ -63,10 +55,6 @@ class AdamsBashforthOrder2TimeIntegrationScheme : public TimeIntegrationScheme
public:
AdamsBashforthOrder2TimeIntegrationScheme() : TimeIntegrationScheme()
{
std::cout
<< "AdamsBashforthOrder2TimeIntegrationScheme Construtor: this is "
<< this << "\n";
m_integration_phases = TimeIntegrationSchemeDataVector(2);
m_integration_phases[0] = TimeIntegrationSchemeDataSharedPtr(
new TimeIntegrationSchemeData(this));
......@@ -74,8 +62,7 @@ public:
new TimeIntegrationSchemeData(this));
ForwardEulerTimeIntegrationScheme::SetupSchemeData(
m_integration_phases[0]); // FIXME... need the correct initial
// phase.... (eForwardEuler)
m_integration_phases[0]);
AdamsBashforthOrder2TimeIntegrationScheme::SetupSchemeData(
m_integration_phases[1]);
}
......@@ -84,35 +71,22 @@ public:
{
}
/////////////
static TimeIntegrationSchemeSharedPtr create() // FYI, the create() function
// is called by the Factory.
static TimeIntegrationSchemeSharedPtr create()
{
std::cout << "AdamsBashforthOrder2TimeIntegrationScheme::create()\n";
TimeIntegrationSchemeSharedPtr p = MemoryManager<
AdamsBashforthOrder2TimeIntegrationScheme>::AllocateSharedPtr();
return p;
}
static std::string className; // Is set to "AdamsBashforthOrder2" in
// SchemeInitializor.cpp during program start
// up.
//////////////
static std::string className;
LUE virtual TimeIntegrationMethod GetIntegrationMethod() const
{
return TimeIntegrationMethod::eAdamsBashforthOrder2;
}
//////////////
LUE static void SetupSchemeData(TimeIntegrationSchemeDataSharedPtr &phase)
{
std::cout
<< "AdamsBashforthOrder2TimeIntegrationScheme::SetupSchemeData()\n";
phase->m_method = TimeIntegrationMethod::eAdamsBashforthOrder2;
phase->m_schemeType = eExplicit;
......@@ -189,8 +163,6 @@ public:
{
}
/////////////
static TimeIntegrationSchemeSharedPtr create()
{
TimeIntegrationSchemeSharedPtr p = MemoryManager<
......@@ -198,18 +170,13 @@ public:
return p;
}
static std::string
className; // Is set in SchemeInitializor.cpp during program start up.
//////////////
static std::string className;
LUE virtual TimeIntegrationMethod GetIntegrationMethod() const
{
return TimeIntegrationMethod::eAdamsBashforthOrder3;
}
//////////////
LUE static void SetupSchemeData(TimeIntegrationSchemeDataSharedPtr &phase)
{
phase->m_method = TimeIntegrationMethod::eAdamsBashforthOrder3;
......@@ -299,8 +266,6 @@ public:
{
}
/////////////
static TimeIntegrationSchemeSharedPtr create()
{
TimeIntegrationSchemeSharedPtr p = MemoryManager<
......@@ -308,18 +273,13 @@ public:
return p;
}
static std::string
className; // Is set in SchemeInitializor.cpp during program start up.
//////////////
static std::string className;
LUE virtual TimeIntegrationMethod GetIntegrationMethod() const
{
return TimeIntegrationMethod::eAdamsBashforthOrder4;
}
//////////////
LUE static void SetupSchemeData(TimeIntegrationSchemeDataSharedPtr &phase)
{
phase->m_method = TimeIntegrationMethod::eAdamsBashforthOrder4;
......
#pragma once
///////////////////////////////////////////////////////////////////////////////
//
// File: CNABTimeIntegrationScheme.h
......@@ -35,18 +33,13 @@
//
///////////////////////////////////////////////////////////////////////////////
#include <LibUtilities/TimeIntegration/TimeIntegrationScheme.h>
#pragma once
#include <LibUtilities/TimeIntegration/TimeIntegrationScheme.h>
#include <LibUtilities/TimeIntegration/IMEXdirkTimeIntegrationSchemes.h>
#include <iostream>
///////////////////////////////////////////////////////////////////////////////
#define LUE LIB_UTILITIES_EXPORT
///////////////////////////////////////////////////////////////////////////////
namespace Nektar
{
namespace LibUtilities
......@@ -57,7 +50,6 @@ class CNABTimeIntegrationScheme : public TimeIntegrationScheme
public:
CNABTimeIntegrationScheme() : TimeIntegrationScheme()
{
std::cout << "creating a CNABTimeIntegrationScheme\n";
m_integration_phases = TimeIntegrationSchemeDataVector(3);
m_integration_phases[0] = TimeIntegrationSchemeDataSharedPtr(
new TimeIntegrationSchemeData(this));
......@@ -78,11 +70,8 @@ public:
{
}
/////////////
static TimeIntegrationSchemeSharedPtr create()
{
std::cout << "CNABTimeIntegrationScheme::create()\n";
TimeIntegrationSchemeSharedPtr p =
MemoryManager<CNABTimeIntegrationScheme>::AllocateSharedPtr();
return p;
......@@ -90,19 +79,13 @@ public:
static std::string className;
//////////////
LUE virtual TimeIntegrationMethod GetIntegrationMethod() const
{
return TimeIntegrationMethod::eCNAB;
}
//////////////
LUE static void SetupSchemeData(TimeIntegrationSchemeDataSharedPtr &phase)
{
std::cout << "SetupSchemeData for CNABTimeIntegrationScheme\n";
phase->m_method = TimeIntegrationMethod::eCNAB;
phase->m_schemeType = eIMEX;
......
#pragma once
///////////////////////////////////////////////////////////////////////////////
//
// File: DIRKTimeIntegrationSchemes.h
......@@ -36,14 +34,12 @@
//
///////////////////////////////////////////////////////////////////////////////
#include <LibUtilities/TimeIntegration/TimeIntegrationScheme.h>
#pragma once
///////////////////////////////////////////////////////////////////////////////
#include <LibUtilities/TimeIntegration/TimeIntegrationScheme.h>
#define LUE LIB_UTILITIES_EXPORT
///////////////////////////////////////////////////////////////////////////////
namespace Nektar
{
namespace LibUtilities
......@@ -69,30 +65,20 @@ public:
{
}
/////////////
static TimeIntegrationSchemeSharedPtr create()
{
std::cout << "DIRKOrder2TimeIntegrationScheme::create()\n";
TimeIntegrationSchemeSharedPtr p =
MemoryManager<DIRKOrder2TimeIntegrationScheme>::AllocateSharedPtr();
return p;
}
static std::string className; // Is set to "DIRKOrder2" in
// SchemeInitializor.cpp during program start
// up.
//////////////
static std::string className;
LUE virtual TimeIntegrationMethod GetIntegrationMethod() const
{
return TimeIntegrationMethod::eIMEXdirk_3_4_3;
}
//////////////
LUE static void SetupSchemeData(TimeIntegrationSchemeDataSharedPtr &phase)
{
phase->m_method = TimeIntegrationMethod::eIMEXdirk_3_4_3;
......@@ -161,8 +147,6 @@ public:
{
}
/////////////
static TimeIntegrationSchemeSharedPtr create()
{
TimeIntegrationSchemeSharedPtr p =
......@@ -170,19 +154,13 @@ public:
return p;
}
static std::string className; // Is set to "DIRKOrder3" in
// SchemeInitializor.cpp during program start
// up.
//////////////
static std::string className;
LUE virtual TimeIntegrationMethod GetIntegrationMethod() const
{
return TimeIntegrationMethod::eDIRKOrder3;
}
//////////////
LUE static void SetupSchemeData(TimeIntegrationSchemeDataSharedPtr &phase)
{
phase->m_method = TimeIntegrationMethod::eDIRKOrder3;
......
#pragma once
///////////////////////////////////////////////////////////////////////////////
//
// File: EulerTimeIntegrationSchemes.h
......@@ -36,15 +34,13 @@
//
///////////////////////////////////////////////////////////////////////////////
#define LUE LIB_UTILITIES_EXPORT
#pragma once
///////////////////////////////////////////////////////////////////////////////
#define LUE LIB_UTILITIES_EXPORT
#include <LibUtilities/TimeIntegration/TimeIntegrationScheme.h>
#include <LibUtilities/TimeIntegration/TimeIntegrationSchemeData.h>
///////////////////////////////////////////////////////////////////////////////
namespace Nektar
{
namespace LibUtilities
......@@ -70,29 +66,20 @@ public:
{
}
/////////////
static TimeIntegrationSchemeSharedPtr create()
{
std::cout << "BackwardEulerTimeIntegrationScheme::create()\n";
TimeIntegrationSchemeSharedPtr p = MemoryManager<
BackwardEulerTimeIntegrationScheme>::AllocateSharedPtr();
return p;
}
static std::string className; // Is set to "BackwardEuler" in
// SchemeInitializor.cpp during program start
// up.
//////////////
static std::string className;
LUE virtual TimeIntegrationMethod GetIntegrationMethod() const
{
return TimeIntegrationMethod::eBackwardEuler;
}
//////////////
LUE static void SetupSchemeData(TimeIntegrationSchemeDataSharedPtr &phase)
{
phase->m_method = TimeIntegrationMethod::eBackwardEuler;
......@@ -153,33 +140,22 @@ public:
{
}
/////////////
static TimeIntegrationSchemeSharedPtr create()
{
std::cout << "ForwardEulerTimeIntegrationScheme::create()\n";
TimeIntegrationSchemeSharedPtr p = MemoryManager<
ForwardEulerTimeIntegrationScheme>::AllocateSharedPtr();
return p;
}
static std::string className; // Is set to "ForwardEuler" in
// SchemeInitializor.cpp during program start
// up.
//////////////
static std::string className;
LUE virtual TimeIntegrationMethod GetIntegrationMethod() const
{
return TimeIntegrationMethod::eForwardEuler;
}
//////////////
LUE static void SetupSchemeData(TimeIntegrationSchemeDataSharedPtr &phase)
{
std::cout << "ForwardEulerTimeIntegrationScheme::SetupSchemeData()\n";
phase->m_method = TimeIntegrationMethod::eForwardEuler;
phase->m_schemeType = eExplicit;
......
......@@ -34,18 +34,11 @@
// Description: Combined header file for all basic IMEX time integration
// schemes.
//
///////////////////////////////////////////////////////////////////////////////
#define LUE LIB_UTILITIES_EXPORT
///////////////////////////////////////////////////////////////////////////////
#include <LibUtilities/TimeIntegration/TimeIntegrationScheme.h>
#include <LibUtilities/TimeIntegration/IMEXdirkTimeIntegrationSchemes.h>
///////////////////////////////////////////////////////////////////////////////
namespace Nektar
{
namespace LibUtilities
......@@ -71,9 +64,6 @@ public:
{
}
/////////////
// The create() function is called by the Factory.
static TimeIntegrationSchemeSharedPtr create()
{
TimeIntegrationSchemeSharedPtr p =
......@@ -81,19 +71,13 @@ public:
return p;
}
static std::string className; // Will be set to "IMEXOrder1" in
// SchemeInitializor.cpp during program start
// up.
//////////////
static std::string className;
LUE virtual TimeIntegrationMethod GetIntegrationMethod() const
{
return TimeIntegrationMethod::eIMEXOrder1;
}
//////////////
LUE static void SetupSchemeData(TimeIntegrationSchemeDataSharedPtr &phase)
{
phase->m_method = TimeIntegrationMethod::eIMEXOrder1;
......@@ -153,55 +137,38 @@ class IMEXOrder2TimeIntegrationScheme : public TimeIntegrationScheme
public:
IMEXOrder2TimeIntegrationScheme() : TimeIntegrationScheme()
{
std::cout << "IMEXOrder2TimeIntegrationScheme Construtor: this is "
<< this << "\n";
m_integration_phases = TimeIntegrationSchemeDataVector(2);
m_integration_phases[0] = TimeIntegrationSchemeDataSharedPtr(
new TimeIntegrationSchemeData(this));
m_integration_phases[1] = TimeIntegrationSchemeDataSharedPtr(
new TimeIntegrationSchemeData(this));
// IMEXdirk_2_3_2TimeIntegrationScheme::SetupSchemeData(
// m_integration_phases[0] ); // Setup 1st part using ???? FIXME...
// should be dirk or imex order 1?
IMEXOrder1TimeIntegrationScheme::SetupSchemeData(
m_integration_phases[0]); // Setup 1st part using ???? FIXME...
// should be dirk or imex order 1?
m_integration_phases[0]);
IMEXOrder2TimeIntegrationScheme::SetupSchemeData(
m_integration_phases[1]); // Setup 2nd part using IMEX Order 2
m_integration_phases[1]);
}
virtual ~IMEXOrder2TimeIntegrationScheme()
{
}
/////////////
static TimeIntegrationSchemeSharedPtr create()
{
std::cout << "IMEXOrder2TimeIntegrationScheme::create()\n";
TimeIntegrationSchemeSharedPtr p =
MemoryManager<IMEXOrder2TimeIntegrationScheme>::AllocateSharedPtr();
return p;
}
static std::string className; // Will be set in SchemeInitializor.cpp during
// program start up.
//////////////
static std::string className;
LUE virtual TimeIntegrationMethod GetIntegrationMethod() const
{
return TimeIntegrationMethod::eIMEXOrder2;
}
//////////////
LUE static void SetupSchemeData(TimeIntegrationSchemeDataSharedPtr &phase)
{
std::cout << "IMEXOrder2TimeIntegrationScheme::SetupSchemeData()\n";
phase->m_method = TimeIntegrationMethod::eIMEXOrder2;
phase->m_schemeType = eIMEX;
......@@ -271,9 +238,6 @@ class IMEXOrder3TimeIntegrationScheme : public TimeIntegrationScheme
public:
IMEXOrder3TimeIntegrationScheme() : TimeIntegrationScheme()
{
std::cout << "IMEXOrder3TimeIntegrationScheme Construtor: this is "
<< this << "\n";
m_integration_phases = TimeIntegrationSchemeDataVector(3);
m_integration_phases[0] = TimeIntegrationSchemeDataSharedPtr(
new TimeIntegrationSchemeData(this));
......@@ -288,36 +252,26 @@ public:
m_integration_phases[1]);
IMEXOrder3TimeIntegrationScheme::SetupSchemeData(
m_integration_phases[2]);
std::cout << "done with IMEXOrder3TimeIntegrationScheme constructor\n";
}
virtual ~IMEXOrder3TimeIntegrationScheme()
{
}
/////////////
static TimeIntegrationSchemeSharedPtr create()
{
std::cout << "IMEXOrder3TimeIntegrationScheme::create()\n";
TimeIntegrationSchemeSharedPtr p =
MemoryManager<IMEXOrder3TimeIntegrationScheme>::AllocateSharedPtr();
return p;
}
static std::string className; // Will be set in SchemeInitializor.cpp during
// program start up.
//////////////
static std::string className;
LUE virtual TimeIntegrationMethod GetIntegrationMethod() const
{
return TimeIntegrationMethod::eIMEXOrder3;
}
//////////////
LUE static void SetupSchemeData(TimeIntegrationSchemeDataSharedPtr &phase)
{
phase->m_method = TimeIntegrationMethod::eIMEXOrder3;
......@@ -397,9 +351,6 @@ class IMEXOrder4TimeIntegrationScheme : public TimeIntegrationScheme
public:
IMEXOrder4TimeIntegrationScheme() : TimeIntegrationScheme()
{
std::cout << "IMEXOrder4TimeIntegrationScheme Construtor: this is "
<< this << "\n";
m_integration_phases = TimeIntegrationSchemeDataVector(4);
m_integration_phases[0] = TimeIntegrationSchemeDataSharedPtr(
new TimeIntegrationSchemeData(this));
......@@ -418,36 +369,26 @@ public:
m_integration_phases[2]);
IMEXOrder4TimeIntegrationScheme::SetupSchemeData(
m_integration_phases[3]);
std::cout << "done with IMEXOrder4TimeIntegrationScheme constructor\n";
}
virtual ~IMEXOrder4TimeIntegrationScheme()
{
}
/////////////
static TimeIntegrationSchemeSharedPtr create()
{
std::cout << "IMEXOrder4TimeIntegrationScheme::create()\n";
TimeIntegrationSchemeSharedPtr p =
MemoryManager<IMEXOrder4TimeIntegrationScheme>::AllocateSharedPtr();
return p;
}
static std::string className; // Will be set in SchemeInitializor.cpp during
// program start up.
//////////////
static std::string className;
LUE virtual TimeIntegrationMethod GetIntegrationMethod() const
{
return TimeIntegrationMethod::eIMEXOrder4;
}
//////////////
LUE static void SetupSchemeData(TimeIntegrationSchemeDataSharedPtr &phase)
{
......
#pragma once
///////////////////////////////////////////////////////////////////////////////
//
// File: IMEXdirkTimeIntegrationSchemes.h
......@@ -36,14 +34,12 @@
//
///////////////////////////////////////////////////////////////////////////////
#include <LibUtilities/TimeIntegration/TimeIntegrationScheme.h>
#pragma once
///////////////////////////////////////////////////////////////////////////////
#include <LibUtilities/TimeIntegration/TimeIntegrationScheme.h>
#define LUE LIB_UTILITIES_EXPORT
///////////////////////////////////////////////////////////////////////////////
namespace Nektar
{
namespace LibUtilities
......@@ -69,8 +65,6 @@ public:
{
}
/////////////
static TimeIntegrationSchemeSharedPtr create()
{
TimeIntegrationSchemeSharedPtr p = MemoryManager<
......@@ -78,19 +72,13 @@ public:
return p;
}
static std::string className; // Is set to "IMEXdirk_1_2_1" in
// SchemeInitializor.cpp during program start
// up.
//////////////
static std::string className;
LUE TimeIntegrationMethod GetIntegrationMethod() const
{
return TimeIntegrationMethod::eIMEXdirk_1_2_1;
}
//////////////
LUE static void SetupSchemeData(TimeIntegrationSchemeDataSharedPtr &phase)
{
phase->m_method = TimeIntegrationMethod::eIMEXdirk_1_2_1;
......@@ -163,8 +151,6 @@ public:
{
}
/////////////
static TimeIntegrationSchemeSharedPtr create()
{
TimeIntegrationSchemeSharedPtr p = MemoryManager<
......@@ -172,18 +158,13 @@ public:
return p;
}
static std::string
className; // Is set in SchemeInitializor.cpp during program start up.
//////////////
static std::string className;
LUE TimeIntegrationMethod GetIntegrationMethod() const
{
return TimeIntegrationMethod::eIMEXdirk_1_2_2;
}
//////////////
LUE static void SetupSchemeData(TimeIntegrationSchemeDataSharedPtr &phase)
{
phase->m_method = TimeIntegrationMethod::eIMEXdirk_1_2_2;
......@@ -256,8 +237,6 @@ public:
{
}
/////////////
static TimeIntegrationSchemeSharedPtr create()
{
TimeIntegrationSchemeSharedPtr p = MemoryManager<
......@@ -265,18 +244,13 @@ public:
return p;
}
static std::string
className; // Is set in SchemeInitializor.cpp during program start up.
//////////////
static std::string className;
LUE virtual TimeIntegrationMethod GetIntegrationMethod() const
{
return TimeIntegrationMethod::eIMEXdirk_2_2_2;
}
//////////////
LUE static void SetupSchemeData(TimeIntegrationSchemeDataSharedPtr &phase)
{
phase->m_method = TimeIntegrationMethod::eIMEXdirk_2_2_2;
......@@ -359,8 +333,6 @@ public:
{
}
/////////////
static TimeIntegrationSchemeSharedPtr create()
{
TimeIntegrationSchemeSharedPtr p = MemoryManager<
......@@ -368,22 +340,15 @@ public:
return p;
}
static std::string
className; // Is set in SchemeInitializor.cpp during program start up.
//////////////
static std::string className;
LUE virtual TimeIntegrationMethod GetIntegrationMethod() const
{
return TimeIntegrationMethod::eIMEXdirk_2_3_2;
}
//////////////
LUE static void SetupSchemeData(TimeIntegrationSchemeDataSharedPtr &phase)
{
std::cout << "IMEXdirk_2_3_2TimeIntegrationScheme::SetupSchemeData()\n";
phase->m_method = TimeIntegrationMethod::eIMEXdirk_2_3_2;
phase->m_schemeType = eIMEX;
......@@ -464,8 +429,6 @@ public:
{
}