Skip to content

Commit

Permalink
fixing ShellDKGT full constructor
Browse files Browse the repository at this point in the history
  • Loading branch information
imeg committed Oct 4, 2019
1 parent 9884819 commit 8f9dfc6
Show file tree
Hide file tree
Showing 14 changed files with 7 additions and 110 deletions.
2 changes: 1 addition & 1 deletion Win64/bin/Debug/OpenSees.NET.x64.dll.metagen
Original file line number Diff line number Diff line change
Expand Up @@ -3286,7 +3286,7 @@ Class OpenSees.Elements.ShellDKGQWrapper: AutoLayout, AnsiClass, Class, Public,
Void .ctor(Int32, Int32, Int32, Int32, Int32, OpenSees.Materials.Sections.SectionForceDeformationWrapper): PrivateScope, Public, HideBySig, SpecialName, RTSpecialName
Class OpenSees.Elements.ShellDKGTWrapper: AutoLayout, AnsiClass, Class, Public, BeforeFieldInit
:OpenSees.Elements.ElementWrapper
Void .ctor(Int32, Int32, Int32, Int32, OpenSees.Materials.Sections.SectionForceDeformationWrapper): PrivateScope, Public, HideBySig, SpecialName, RTSpecialName
Void .ctor(Int32, Int32, Int32, Int32, OpenSees.Materials.Sections.SectionForceDeformationWrapper, Double, Double, Double): PrivateScope, Public, HideBySig, SpecialName, RTSpecialName
Class OpenSees.Elements.ShellMITC4Wrapper: AutoLayout, AnsiClass, Class, Public, BeforeFieldInit
:OpenSees.Elements.ElementWrapper
Void .ctor(Int32, Int32, Int32, Int32, Int32, OpenSees.Materials.Sections.SectionForceDeformationWrapper, Boolean): PrivateScope, Public, HideBySig, SpecialName, RTSpecialName
Expand Down
2 changes: 1 addition & 1 deletion Win64/bin/OpenSees.NET.x64.dll.metagen
Original file line number Diff line number Diff line change
Expand Up @@ -3286,7 +3286,7 @@ Class OpenSees.Elements.ShellDKGQWrapper: AutoLayout, AnsiClass, Class, Public,
Void .ctor(Int32, Int32, Int32, Int32, Int32, OpenSees.Materials.Sections.SectionForceDeformationWrapper): PrivateScope, Public, HideBySig, SpecialName, RTSpecialName
Class OpenSees.Elements.ShellDKGTWrapper: AutoLayout, AnsiClass, Class, Public, BeforeFieldInit
:OpenSees.Elements.ElementWrapper
Void .ctor(Int32, Int32, Int32, Int32, OpenSees.Materials.Sections.SectionForceDeformationWrapper): PrivateScope, Public, HideBySig, SpecialName, RTSpecialName
Void .ctor(Int32, Int32, Int32, Int32, OpenSees.Materials.Sections.SectionForceDeformationWrapper, Double, Double, Double): PrivateScope, Public, HideBySig, SpecialName, RTSpecialName
Class OpenSees.Elements.ShellMITC4Wrapper: AutoLayout, AnsiClass, Class, Public, BeforeFieldInit
:OpenSees.Elements.ElementWrapper
Void .ctor(Int32, Int32, Int32, Int32, Int32, OpenSees.Materials.Sections.SectionForceDeformationWrapper, Boolean): PrivateScope, Public, HideBySig, SpecialName, RTSpecialName
Expand Down
Binary file modified Win64/bin/OpenSees.NET.x64.exp
Binary file not shown.
4 changes: 2 additions & 2 deletions Win64/proj/OpenSeesNET/elements/shell/ShellWrapper.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,13 @@ ShellDKGTWrapper::ShellDKGTWrapper(int tag,
int node1,
int node2,
int node3,
SectionForceDeformationWrapper^ theMaterial)
SectionForceDeformationWrapper^ theMaterial, double b1, double b2, double b3)
{
_Element = new ShellDKGT(tag,
node1,
node2,
node3,
*theMaterial->_SectionForceDeformation);
*theMaterial->_SectionForceDeformation, b1, b2, b3);
}

ShellMITC4Wrapper::ShellMITC4Wrapper(int tag,
Expand Down
2 changes: 1 addition & 1 deletion Win64/proj/OpenSeesNET/elements/shell/ShellWrapper.h
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ namespace OpenSees {
int node1,
int node2,
int node3,
SectionForceDeformationWrapper^ theMaterial);
SectionForceDeformationWrapper^ theMaterial, double b1, double b2, double b3);
~ShellDKGTWrapper() {
if (_Element != 0)
delete _Element;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ FiberSection3dWrapper::FiberSection3dWrapper(int tag, array<FiberWrapper^>^ fibe
if (GJ != nullptr)
_GJ = GJ->_UniaxialMaterial;

_SectionForceDeformation = new FiberSection3d(tag, fibers->Length, array2pointer6(fibers), _GJ);
_SectionForceDeformation = new FiberSection3d(tag, fibers->Length, array2pointer6(fibers), *_GJ);
}

FiberSection3dWrapper::FiberSection3dWrapper(int tag, FiberSectionReprWrapper ^ fiberSectionRepr,
Expand Down Expand Up @@ -137,7 +137,7 @@ FiberSection3dWrapper::FiberSection3dWrapper(int tag, FiberSectionReprWrapper ^


_GJ = GJ->_UniaxialMaterial;
_SectionForceDeformation = new FiberSection3d(tag, numFibers, _fibers, _GJ);
_SectionForceDeformation = new FiberSection3d(tag, numFibers, _fibers, *_GJ);
}


Expand Down
103 changes: 0 additions & 103 deletions Win64/proj/OpenSeesNET/x64/Debug/OpenSeesNET.log
Original file line number Diff line number Diff line change
@@ -1,108 +1,5 @@
C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\MSBuild\Microsoft\VC\v160\Microsoft.CppBuild.targets(452,5): warning MSB8028: The intermediate directory (x64\Debug\) contains files shared from another project (OpenSeesWrapper.vcxproj). This can lead to incorrect clean and rebuild behavior.
stdafx.cpp
AcceleratorWrapper.cpp
AlgorithmsWrapper.cpp
LineSearchWrapper.cpp
AnalysisWrapper.cpp
C:\Git Projects\OpenSees.NET\Win64\proj\OpenSeesNET\analysis\analysis\AnalysisWrapper.h(181,16): warning C4490: 'override': incorrect use of override specifier; 'OpenSees::Analysis::PFEMAnalysisAnalysisWrapper::Analyze' does not match a base ref class method
C:\Git Projects\OpenSees.NET\Win64\proj\OpenSeesNET\analysis\analysis\AnalysisWrapper.h(181,16): message : 'new' or 'override' are only allowed when a matching base method from a ref class exists
C:\Git Projects\OpenSees.NET\Win64\proj\OpenSeesNET\analysis\analysis\AnalysisWrapper.h(206,16): warning C4490: 'override': incorrect use of override specifier; 'OpenSees::Analysis::VariableTimeStepDirectIntegrationAnalysisWrapper::Analyze' does not match a base ref class method
ConstraintHandlerWrapper.cpp
IncrementalIntegratorWrapper.cpp
IntegratorWrapper.cpp
StaticIntegratorWrapper.cpp
TransientIntegratorWrapper.cpp
AnalysisModelWrapper.cpp
DOF_NumbererWrapper.cpp
AssemblyInfo.cpp
ConvergenceTestWrapper.cpp
DamageModelWrapper.cpp
DomainComponentWrapper.cpp
ConstraintWrapper.cpp
BaseDomainWrapper.cpp
DomainEvent.cpp
DomainWrapper.cpp
GroudMotionWrapper.cpp
Generating Code...
Compiling...
LoadWrapper.cpp
NodeWrapper.cpp
LoadPatternWrapper.cpp
TimeSeriesWrapper.cpp
AdapterWrapper.cpp
BaseElementWrapper.cpp
BeamColumnWrapper.cpp
BeamIntegrationWrapper.cpp
BearingWrapper.cpp
BrickWrapper.cpp
CatenaryCableWrapper.cpp
CrdTransfWrapper.cpp
ElementWrapper.cpp
ExternalElementWrapper.cpp
OtherElementWrapper.cpp
Quad4FiberOverlayWrapper.cpp
SurfaceLoadWrapper.cpp
C:\Git Projects\OpenSees.NET\Win64\proj\OpenSeesNET\analysis\analysis\AnalysisWrapper.h(206,16): message : 'new' or 'override' are only allowed when a matching base method from a ref class exists
C:\Git Projects\OpenSees.NET\src\element\surfaceLoad\TriSurfaceLoad.h(38,1): warning C4005: 'SL_NUM_NODE': macro redefinition
C:\Git Projects\OpenSees.NET\src\element\surfaceLoad\SurfaceLoad.h(39): message : see previous definition of 'SL_NUM_NODE'
C:\Git Projects\OpenSees.NET\src\element\surfaceLoad\TriSurfaceLoad.h(42,1): warning C4005: 'SL_NUM_DOF': macro redefinition
C:\Git Projects\OpenSees.NET\src\element\surfaceLoad\SurfaceLoad.h(43): message : see previous definition of 'SL_NUM_DOF'
C:\Git Projects\OpenSees.NET\src\element\surfaceLoad\TriSurfaceLoad.h(44,1): warning C4005: 'SL_NUM_DDOF': macro redefinition
QuadWrapper.cpp
ShellWrapper.cpp
TrussWrapper.cpp
Generating Code...
Compiling...
ULBeamColumnWrapper.cpp
C:\Git Projects\OpenSees.NET\src\element\surfaceLoad\SurfaceLoad.h(45): message : see previous definition of 'SL_NUM_DDOF'
CoupledZeroLengthWrapper.cpp
ZeroLengthElementWrapper.cpp
GraphNumbererWrapper.cpp
HandlerWrapper.cpp
MaterialWrapper.cpp
NDMaterialWrapper.cpp
FiberWrapper.cpp
SectionIntegrationWrapper.cpp
PatchWrapper.cpp
ReinfLayerWrapper.cpp
SectionRepresWrapper.cpp
SectionForceDeformationWrapper.cpp
LimitCurveWrapper.cpp
UniaxialMaterialWrapper.cpp
UniaxialMaterialWrapper_all.cpp
YieldSurfaceWrapper.cpp
IDWrapper.cpp
MatrixWrapper.cpp
VectorWrapper.cpp
Generating Code...
Compiling...
OPS.cpp
InformationWrapper.cpp
RecorderWrapper.cpp
ResponseWrapper.cpp
ResponseWrapper_all.cpp
ArpackSOEWrapper.cpp
BandGENWrapper.cpp
BandSPDWrapper.cpp
DiagonalWrapper.cpp
EigenSOEWrapper.cpp
EigenSolverWrapper.cpp
FullGENWrapper.cpp
LinearSOESolverWrapper.cpp
LinearSOEWrapper.cpp
ProfileSPDWrapper.cpp
SolverWrapper.cpp
SparseGENWrapper.cpp
SparseSYMWrapper.cpp
SYMBandEigenWrapper.cpp
SystemOfEqnWrapper.cpp
Generating Code...
Compiling...
UmfpackGenWrapper.cpp
TaggedObjectWrapper.cpp
TclWrapper.cpp
Generating Code...
C:\Git Projects\OpenSees.NET\Win64\proj\OpenSeesNET\elements\ULBeamColumn\ULBeamColumnWrapper.h(19,10): warning C4067: unexpected tokens following preprocessor directive - expected a newline
C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\MSBuild\Microsoft\VC\v160\Microsoft.CppBuild.targets(1267,5): warning MSB8012: TargetPath(C:\Git Projects\OpenSees.NET\Win64\\bin\Debug\OpenSees.NET.x64.dll.dll) does not match the Linker's OutputFile property value (C:\Git Projects\OpenSees.NET\Win64\bin\Debug\OpenSees.NET.x64.dll). This may cause your project to build incorrectly. To correct this, please make sure that $(OutDir), $(TargetName) and $(TargetExt) property values match the value specified in %(Link.OutputFile).
C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\MSBuild\Microsoft\VC\v160\Microsoft.CppBuild.targets(1269,5): warning MSB8012: TargetName(OpenSees.NET.x64.dll) does not match the Linker's OutputFile property value (OpenSees.NET.x64). This may cause your project to build incorrectly. To correct this, please make sure that $(OutDir), $(TargetName) and $(TargetExt) property values match the value specified in %(Link.OutputFile).
AcceleratorWrapper.obj : MSIL module encountered; incremental linking is disabled for MSIL; performing full link
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified Win64/proj/OpenSeesNET/x64/Debug/OpenSeesNET.tlog/rc.read.1.tlog
Binary file not shown.
Binary file modified Win64/proj/OpenSeesNET/x64/Debug/OpenSeesNET.tlog/rc.write.1.tlog
Binary file not shown.
Binary file not shown.

0 comments on commit 8f9dfc6

Please sign in to comment.