Merge branch 'master' into re-add-mpco-recorder-tcl

zhuminjie · Aug 27, 2021 · 34b61d5 · 34b61d5
2 parents 4faddd7 + 6602bf0
commit 34b61d5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/SRC/classTags.h b/SRC/classTags.h
@@ -230,14 +230,15 @@
 #define MAT_TAG_PySimple3                    214
 #define MAT_TAG_PlateBearingConnectionThermal 215
 #define MAT_TAG_ASD_SMA_3K                    216
-#define MAT_TAG_SteelFractureDI			217 // galvisf
 
 #define MAT_TAG_Masonry 217
 #define MAT_TAG_Masonryt 218
 #define MAT_TAG_Trilinwp 219
 #define MAT_TAG_Trilinwp2 220
 #define MAT_TAG_Trilinwpd 221
 
+#define MAT_TAG_SteelFractureDI			222 // galvisf
+
 #define MAT_TAG_FedeasMaterial    1000
 #define MAT_TAG_FedeasBond1       1001
 #define MAT_TAG_FedeasBond2       1002

diff --git a/Win64/proj/material/material.vcxproj.filters b/Win64/proj/material/material.vcxproj.filters
@@ -1371,6 +1371,8 @@
       <Filter>section</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\SRC\material\uniaxial\SteelFractureDI.cpp">
+      <Filter>uniaxial</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\..\SRC\material\uniaxial\Masonry.cpp">
       <Filter>uniaxial</Filter>
     </ClCompile>