Merge pull request #664 from jaabell/master

Fixes clash of Vec type defined in RockingBC.h:64 with definition in …

SRC/Makefile

@@ -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
@@ -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)
@@ -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 \

SRC/actor/objectBroker/FEM_ObjectBrokerAllClasses.cpp

@@ -2287,8 +2287,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