Fix the vcxproj.filters for materials.

-Clean the SLModel files.
zhuminjie · Feb 24, 2020 · ee729fe · ee729fe
1 parent 00bbfb2
commit ee729fe
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 84 deletions.
diff --git a/SRC/material/uniaxial/SLModel.cpp b/SRC/material/uniaxial/SLModel.cpp
@@ -2027,9 +2027,4 @@ void SLModel::BackBoneTen2Func(void)
   TemptSgmp = tSgmp - tEpsp2 * tEr2;
   tEpsy = -(tSgme - TemptSgmp) / (tEu - tEr2);
   tSgmy = tEu * tEpsy + tSgme;
-
-
 }
-
-
-
diff --git a/SRC/material/uniaxial/SLModel.h b/SRC/material/uniaxial/SLModel.h
@@ -109,81 +109,5 @@ class SLModel : public UniaxialMaterial
 
   double C_Tangent;
   double C_iInitial;
-
 };
-
-
 #endif
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Win64/proj/material/material.vcxproj.filters b/Win64/proj/material/material.vcxproj.filters
@@ -1331,7 +1331,6 @@
     <ClCompile Include="..\..\..\SRC\material\uniaxial\UVCuniaxial.cpp">
       <Filter>uniaxial</Filter>
     </ClCompile>
-<<<<<<< Updated upstream
     <ClCompile Include="..\..\..\SRC\material\uniaxial\TDConcrete.cpp">
       <Filter>uniaxial</Filter>
     </ClCompile>
@@ -1342,9 +1341,9 @@
       <Filter>uniaxial</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\SRC\material\uniaxial\TDConcreteMC10NL.cpp">
-=======
+      <Filter>uniaxial</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\..\SRC\material\uniaxial\SLModel.cpp">
->>>>>>> Stashed changes
       <Filter>uniaxial</Filter>
     </ClCompile>
   </ItemGroup>