diff --git a/SCRIPTS/toOpenSeesPy.py b/SCRIPTS/toOpenSeesPy.py index e7993a488..75bbf542a 100644 --- 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 index e651165d4..04d042c59 100644 --- 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 index b393f9dee..cdb9bc698 100644 --- 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 // 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 index 9f7209134..04225c481 100644 --- 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 + @@ -614,6 +615,7 @@ + diff --git a/Win64/proj/material/material.vcxproj.filters b/Win64/proj/material/material.vcxproj.filters index 901f350e7..f13ed0a1b 100644 --- a/Win64/proj/material/material.vcxproj.filters +++ b/Win64/proj/material/material.vcxproj.filters @@ -1349,6 +1349,9 @@ uniaxial + + nD + @@ -2522,5 +2525,8 @@ uniaxial + + nD + \ No newline at end of file diff --git a/Win64/proj/openSeesPy/OpenSeesPy.vcxproj b/Win64/proj/openSeesPy/OpenSeesPy.vcxproj index ca698509f..fd1a105cc 100644 --- a/Win64/proj/openSeesPy/OpenSeesPy.vcxproj +++ b/Win64/proj/openSeesPy/OpenSeesPy.vcxproj @@ -109,7 +109,7 @@ /FORCE:MULTIPLE %(AdditionalOptions) - 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) + 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) .\..\..\bin\opensees.pyd true c:\Program Files\tcl\lib;c:\ProgramData\Anaconda3\libs;..\..\lib;..\..\lib\release;%(AdditionalLibraryDirectories)