Skip to content

Commit

Permalink
Merge branch 'master' of github.com:OpenSees/OpenSees into contrib-src
Browse files Browse the repository at this point in the history
  • Loading branch information
claudioperez committed Sep 20, 2021
2 parents d89ca45 + 9039f7c commit b5bf59d
Show file tree
Hide file tree
Showing 21 changed files with 711 additions and 464 deletions.
12 changes: 11 additions & 1 deletion SRC/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -1077,6 +1077,13 @@ SECTION_LIBS = $(FE)/material/section/SectionForceDeformation.o \

SUPER_LU_OBJ = $(FE)/system_of_eqn/linearSOE/sparseGEN/SuperLU.o

PETSC_SOE_OBJ =
ifeq ($(HAVEPETSC), YES)
PETSC_SOE_OBJ = $(FE)/system_of_eqn/linearSOE/petsc/PetscSOE.o \
$(FE)/system_of_eqn/linearSOE/petsc/PetscSolver.o \
$(FE)/system_of_eqn/linearSOE/petsc/PetscSparseSeqSolver.o
endif

ifeq ($(PROGRAMMING_MODE), THREADS)
SUPER_LU_OBJ = $(FE)/system_of_eqn/linearSOE/sparseGEN/ThreadedSuperLU.o
endif
Expand All @@ -1088,7 +1095,8 @@ SUPER_LU_OBJ = $(FE)/system_of_eqn/linearSOE/sparseGEN/SuperLU.o \
$(FE)/system_of_eqn/linearSOE/mumps/MumpsParallelSOE.o \
$(FE)/system_of_eqn/linearSOE/mumps/MumpsParallelSolver.o \
$(FE)/system_of_eqn/linearSOE/mumps/MumpsSOE.o \
$(FE)/system_of_eqn/linearSOE/mumps/MumpsSolver.o
$(FE)/system_of_eqn/linearSOE/mumps/MumpsSolver.o \
$(PETSC_SOE_OBJ)
endif

ifeq ($(PROGRAMMING_MODE), PARALLEL_INTERPRETERS)
Expand All @@ -1101,6 +1109,8 @@ SUPER_LU_OBJ = $(FE)/system_of_eqn/linearSOE/sparseGEN/SuperLU.o \
$(FE)/system_of_eqn/linearSOE/mumps/MumpsSolver.o
endif



CUDA_CLASSES =

SequentialSysOfEqn_LIBS = $(FE)/system_of_eqn/linearSOE/LinearSOE.o \
Expand Down
3 changes: 1 addition & 2 deletions SRC/actor/objectBroker/FEM_ObjectBrokerAllClasses.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2295,8 +2295,7 @@ FEM_ObjectBrokerAllClasses::getNewLinearSOE(int classTagSOE)

#ifdef _PETSC
case LinSOE_TAGS_PetscSOE:
thePetscSolver = new PetscSolver();
theSOE = new PetscSOE(*thePetscSolver);
theSOE = new PetscSOE(*( new PetscSolver()));
return theSOE;
#endif

Expand Down
Loading

0 comments on commit b5bf59d

Please sign in to comment.