Merge branch 'master' of git://github.com/OpenSees/OpenSees into cbdi3d

zhuminjie · Aug 18, 2020 · 3379120 · 3379120
2 parents e6a985b + 102ca7c
commit 3379120
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 1 deletion.
diff --git a/SCRIPTS/toOpenSeesPy.py b/SCRIPTS/toOpenSeesPy.py
@@ -102,6 +102,11 @@ def toOpenSeesPy(infile, outfile):
             if info[i] == '}':
                 writeClose = False                
                 break
+            if info[0] == 'recorder':
+                # If it's a recorder, make everything immediately  after material, section, or fiber a string
+                if info[i-1] in ['material','section','fiber'] and isfloat(info[i]):
+                    outfile.write(',str(%s)' % info[i])
+                    continue
             if isfloat(info[i]):
                 outfile.write(',%s' % info[i])
             else:

diff --git a/SRC/interpreter/OpenSeesElementCommands.cpp b/SRC/interpreter/OpenSeesElementCommands.cpp
@@ -268,6 +268,7 @@ namespace {
 	if(ndm == 2) {
 	    return OPS_ForceBeamColumn2dThermal();
 	} else {
+		return 0;
 	  //return OPS_ForceBeamColumn3dThermal();
 	}
     }
@@ -479,6 +480,7 @@ namespace {
   {
     int ndm = OPS_GetNDM();
     if (ndm == 2) {
+		return 0;
       // return OPS_DispBeamColumn2dID();
     }
     else {

diff --git a/SRC/interpreter/PythonModule.cpp b/SRC/interpreter/PythonModule.cpp
@@ -43,6 +43,7 @@ UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 
 #include "PythonModule.h"
 #include "PythonStream.h"
+#include <OPS_Globals.h>
 
 // define opserr
 static PythonStream sserr;
@@ -286,6 +287,16 @@ initopensees(void)
     Py_INCREF(st->error);
     PyModule_AddObject(pymodule, "OpenSeesError", st->error);
 
+    char version[10];
+    const char *py_version = ".3";
+    for (int i = 0; i < 5; ++i) {
+        version[i] = OPS_VERSION[i];
+    }
+    for (int i = 0; i < 3; ++i) {
+        version[5 + i] = py_version[i];
+    }
+    PyModule_AddStringConstant(pymodule, "__version__", version);
+
     sserr.setError(st->error);
 
     Py_AtExit(cleanupFunc);

diff --git a/SRC/matrix/ID.cpp b/SRC/matrix/ID.cpp
@@ -421,6 +421,7 @@ int
 ID::fill(int fill_value){
   for (int i=0; i<sz; i++)
     data[i] = fill_value;
+  return 0;
 }
 
 

diff --git a/Win64/proj/material/material.vcxproj b/Win64/proj/material/material.vcxproj
@@ -200,6 +200,7 @@
     <ClCompile Include="..\..\..\SRC\material\nD\ElasticIsotropicMaterialThermal.cpp" />
     <ClCompile Include="..\..\..\SRC\material\nD\ExternalNDMaterial.cpp" />
     <ClCompile Include="..\..\..\SRC\material\nD\FSAM.cpp" />
+    <ClCompile Include="..\..\..\SRC\material\nD\IncrementalElasticIsotropicThreeDimensional.cpp" />
     <ClCompile Include="..\..\..\SRC\material\nD\J2BeamFiber2d.cpp" />
     <ClCompile Include="..\..\..\SRC\material\nD\J2BeamFiber3d.cpp" />
     <ClCompile Include="..\..\..\SRC\material\nD\J2PlasticityThermal.cpp" />
@@ -614,6 +615,7 @@
     <ClInclude Include="..\..\..\SRC\material\nD\ElasticIsotropicMaterialThermal.h" />
     <ClInclude Include="..\..\..\SRC\material\nD\ExternalNDMaterial.h" />
     <ClInclude Include="..\..\..\SRC\material\nD\FSAM.h" />
+    <ClInclude Include="..\..\..\SRC\material\nD\IncrementalElasticIsotropicThreeDimensional.h" />
     <ClInclude Include="..\..\..\SRC\material\nD\J2BeamFiber2d.h" />
     <ClInclude Include="..\..\..\SRC\material\nD\J2BeamFiber3d.h" />
     <ClInclude Include="..\..\..\SRC\material\nD\J2PlasticityThermal.h" />

diff --git a/Win64/proj/material/material.vcxproj.filters b/Win64/proj/material/material.vcxproj.filters
@@ -1349,6 +1349,9 @@
     <ClCompile Include="..\..\..\SRC\material\uniaxial\SLModel.cpp">
       <Filter>uniaxial</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\SRC\material\nD\IncrementalElasticIsotropicThreeDimensional.cpp">
+      <Filter>nD</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\SRC\material\uniaxial\AxialSp.h">
@@ -2522,5 +2525,8 @@
     <ClInclude Include="..\..\..\SRC\material\uniaxial\SLModel.h">
       <Filter>uniaxial</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\SRC\material\nD\IncrementalElasticIsotropicThreeDimensional.h">
+      <Filter>nD</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
diff --git a/Win64/proj/openSeesPy/OpenSeesPy.vcxproj b/Win64/proj/openSeesPy/OpenSeesPy.vcxproj
@@ -109,7 +109,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalOptions>/FORCE:MULTIPLE  %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>actor.lib;analysis.lib;arpack.lib;blas.lib;cblas.lib;convergence.lib;cssparse.lib;damage.lib;database.lib;DoddRestrepo.lib;domain.lib;drain.lib;element.lib;feap.lib;fedeas.lib;glu32.lib;graph.lib;handler.lib;ifconsol.lib;lapack.lib;libifcoremt.lib;libmmt.lib;material.lib;matrix.lib;modelbuilder.lib;opengl32.lib;optimization.lib;python37.lib;recorder.lib;reliability.lib;renderer.lib;sdmuc.lib;superLU.lib;system.lib;tagged.lib;tcl.lib;tcl86t.lib;tk86t.lib;umfpackC.lib;utility.lib;wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>actor.lib;analysis.lib;arpack.lib;blas.lib;cblas.lib;convergence.lib;cssparse.lib;damage.lib;database.lib;DoddRestrepo.lib;domain.lib;drain.lib;element.lib;feap.lib;fedeas.lib;glu32.lib;graph.lib;handler.lib;ifconsol.lib;lapack.lib;libifcoremt.lib;libmmt.lib;material.lib;matrix.lib;modelbuilder.lib;opengl32.lib;optimization.lib;python3.lib;recorder.lib;reliability.lib;renderer.lib;sdmuc.lib;superLU.lib;system.lib;tagged.lib;tcl.lib;tcl86t.lib;tk86t.lib;umfpackC.lib;utility.lib;wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>.\..\..\bin\opensees.pyd</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>c:\Program Files\tcl\lib;c:\ProgramData\Anaconda3\libs;..\..\lib;..\..\lib\release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>