Merge pull request #723 from sewkokot/harmonicSSintegrator

Adding HarmonicSteadyState integrator
zhuminjie · Nov 29, 2021 · 4b6b4cb · 4b6b4cb
2 parents abda5f0 + 602d5ce
commit 4b6b4cb
Show file tree

Hide file tree

Showing 10 changed files with 588 additions and 2 deletions.
diff --git a/DEVELOPER/core/classTags.h b/DEVELOPER/core/classTags.h
@@ -910,6 +910,9 @@
 #define INTEGRATOR_TAGS_ExplicitDifference              55
 #define INTEGRATOR_TAGS_EQPath                          56
 #define INTEGRATOR_TAGS_GimmeMCK                        57
+#define INTEGRATOR_TAGS_StagedLoadControl               58
+#define INTEGRATOR_TAGS_StagedNewmark                   59
+#define INTEGRATOR_TAGS_HarmonicSteadyState             60
 
 #define LinSOE_TAGS_FullGenLinSOE		1
 #define LinSOE_TAGS_BandGenLinSOE		2

diff --git a/SRC/Makefile b/SRC/Makefile
@@ -1331,6 +1331,7 @@ ANALYSIS_LIBS = $(FE)/analysis/analysis/Analysis.o \
 	$(FE)/analysis/integrator/IncrementalIntegrator.o \
 	$(FE)/analysis/integrator/StaticIntegrator.o \
 	$(FE)/analysis/integrator/LoadControl.o \
+	$(FE)/analysis/integrator/HarmonicSteadyState.o \
 	$(FE)/analysis/integrator/StagedLoadControl.o \
 	$(FE)/analysis/integrator/StagedNewmark.o \
 	$(FE)/analysis/integrator/EQPath.o \

diff --git a/SRC/analysis/integrator/CMakeLists.txt b/SRC/analysis/integrator/CMakeLists.txt
@@ -14,6 +14,7 @@ target_sources(OPS_Analysis
        IncrementalIntegrator.cpp
        Integrator.cpp
        LoadControl.cpp
+       HarmonicSteadyState.cpp
        LoadPath.cpp
        MinUnbalDispNorm.cpp
        Newmark.cpp
@@ -30,6 +31,7 @@ target_sources(OPS_Analysis
        IncrementalIntegrator.h
        Integrator.h
        LoadControl.h
+       HarmonicSteadyState.h
        LoadPath.h
        MinUnbalDispNorm.h
        Newmark.h