Skip to content

Commit

Permalink
Merge pull request OpenSees#475 from mhscott/expressNewton
Browse files Browse the repository at this point in the history
Express newton
  • Loading branch information
mhscott authored Dec 2, 2020
2 parents 8bac9ca + fc87f9a commit f236e2d
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 1 deletion.
1 change: 1 addition & 0 deletions SRC/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -1240,6 +1240,7 @@ ANALYSIS_LIBS = $(FE)/analysis/analysis/Analysis.o \
$(FE)/analysis/algorithm/equiSolnAlgo/BFGS.o \
$(FE)/analysis/algorithm/equiSolnAlgo/KrylovNewton.o \
$(FE)/analysis/algorithm/equiSolnAlgo/PeriodicNewton.o \
$(FE)/analysis/algorithm/equiSolnAlgo/ExpressNewton.o \
$(FE)/analysis/algorithm/equiSolnAlgo/LineSearch.o \
$(FE)/analysis/algorithm/equiSolnAlgo/BisectionLineSearch.o \
$(FE)/analysis/algorithm/equiSolnAlgo/SecantLineSearch.o \
Expand Down
4 changes: 4 additions & 0 deletions SRC/actor/objectBroker/FEM_ObjectBrokerAllClasses.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -335,6 +335,7 @@
#include "DriftRecorder.h"
#include "MPCORecorder.h"
#include "VTK_Recorder.h"
#include "GmshRecorder.h"

// mp_constraint header files
#include "MP_Constraint.h"
Expand Down Expand Up @@ -413,6 +414,7 @@
#include "DistributedDisplacementControl.h"
#endif
#include "LoadControl.h"
#include "StagedLoadControl.h"

#include "TransientIntegrator.h"
#include "AlphaOS.h"
Expand Down Expand Up @@ -443,6 +445,7 @@
#include "KRAlphaExplicit.h"
#include "KRAlphaExplicit_TP.h"
#include "Newmark.h"
#include "StagedNewmark.h"
#include "NewmarkExplicit.h"
#include "NewmarkHSFixedNumIter.h"
#include "NewmarkHSIncrLimit.h"
Expand Down Expand Up @@ -489,6 +492,7 @@
#include "RectangularSeries.h"
#include "ConstantSeries.h"
#include "TrigSeries.h"
#include "TriangleSeries.h"

// time series integrators
#include "TrapezoidalTimeSeriesIntegrator.h"
Expand Down
3 changes: 2 additions & 1 deletion SRC/analysis/algorithm/equiSolnAlgo/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ OBJS = EquiSolnAlgo.o Linear.o NewtonRaphson.o \
ModifiedNewton.o NewtonLineSearch.o Broyden.o BFGS.o \
KrylovNewton.o PeriodicNewton.o AcceleratedNewton.o \
LineSearch.o InitialInterpolatedLineSearch.o NewtonHallM.o \
SecantLineSearch.o RegulaFalsiLineSearch.o BisectionLineSearch.o
SecantLineSearch.o RegulaFalsiLineSearch.o BisectionLineSearch.o \
ExpressNewton.o

# Compilation control

Expand Down

0 comments on commit f236e2d

Please sign in to comment.