fmk - include changes and formatting

zhuminjie · Sep 23, 2021 · a1ef32e · a1ef32e
1 parent 97c2ee0
commit a1ef32e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/SRC/material/section/FiberSection2d.cpp b/SRC/material/section/FiberSection2d.cpp
@@ -940,6 +940,7 @@ FiberSection2d::setResponse(const char **argv, int argc,
     return theResponse;
 
   } else if (strcmp(argv[0],"fiberData") == 0) {
+
     int numData = numFibers*5;
     for (int j = 0; j < numFibers; j++) {
       output.tag("FiberOutput");
@@ -997,6 +998,7 @@ FiberSection2d::getResponse(int responseID, Information &sectInfo)
     }
     return sectInfo.setVector(data);	
   } else  if (responseID == 6) {
+
     int count = 0;
     for (int j = 0; j < numFibers; j++) {    
       if (theMaterials[j]->hasFailed() == true)

diff --git a/SRC/material/uniaxial/PY/PyLiq1.cpp b/SRC/material/uniaxial/PY/PyLiq1.cpp
@@ -60,14 +60,14 @@
 #include <stdlib.h>
 #include <string.h>
 #include <InitialStateAnalysisWrapper.h>
-#include <SSPquadUP.h>
-#include <SSPquad.h>
+#include <UWelements/SSPquadUP.h>
+#include <UWelements/SSPquad.h>
 #include <elementAPI.h>
 #include <TimeSeries.h>
 
-#include <FourNodeQuad.h>
-#include <FourNodeQuadUP.h>
-#include <Nine_Four_Node_QuadUP.h>
+#include <fourNodeQuad/FourNodeQuad.h>
+#include <UP-ucsd/FourNodeQuadUP.h>
+#include <UP-ucsd/Nine_Four_Node_QuadUP.h>
 #include <FluidSolidPorousMaterial.h>
 #include <PressureDependMultiYield.h>
 

diff --git a/SRC/material/uniaxial/PY/TzLiq1.cpp b/SRC/material/uniaxial/PY/TzLiq1.cpp
@@ -30,15 +30,15 @@
 #include <stdlib.h>
 #include <string.h>
 #include <InitialStateAnalysisWrapper.h>
-#include <SSPquadUP.h>
-#include <SSPquad.h>
+#include <UWelements/SSPquadUP.h>
+#include <UWelements/SSPquad.h>
 #include <elementAPI.h>
 #include <FluidSolidPorousMaterial.h>
 #include <TzSimple1.h>
 #include <iostream>
-#include <FourNodeQuad.h>
-#include <FourNodeQuadUP.h>
-#include <Nine_Four_Node_QuadUP.h>
+#include <fourNodeQuad/FourNodeQuad.h>
+#include <UP-ucsd/FourNodeQuadUP.h>
+#include <UP-ucsd/Nine_Four_Node_QuadUP.h>
 #include <TimeSeries.h>
 
 // Control on internal iteration between spring components