From 294aa8007d6ddc4450c561fac4aa00dc77b01d46 Mon Sep 17 00:00:00 2001 From: Claudio Perez <50180406+claudioperez@users.noreply.github.com> Date: Fri, 25 Jun 2021 11:59:04 -0700 Subject: [PATCH] cmp - add more missing CMakeLists in material/uniaxial --- CMakeLists.txt | 5 ++-- Conf.cmake | 6 ++-- SRC/material/uniaxial/backbone/CMakeLists.txt | 28 +++++++++++++++--- SRC/material/uniaxial/fedeas/CMakeLists.txt | 29 ++++++++++++++++--- .../uniaxial/limitState/CMakeLists.txt | 9 +++--- .../limitState/limitCurve/CMakeLists.txt | 19 ++++++++++++ .../uniaxial/stiffness/CMakeLists.txt | 14 ++++++--- 7 files changed, 89 insertions(+), 21 deletions(-) create mode 100644 SRC/material/uniaxial/limitState/limitCurve/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index acff64a37..bb37929b4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -241,7 +241,8 @@ target_link_libraries(G3 G3_SysOfEqn G3_Tagged G3_Utilities - graph + graph + coordTransformation OPS_ConvergenceTest G3_Numerics ) @@ -308,7 +309,7 @@ opensees_add_cxx_flag(TARGETS OPS_Tcl # OpenSeesTcl #---------------------------- target_link_libraries(OpenSeesTcl - PRIVATE OPS_Tcl OpenSees ${OPS_Element_List} ${CMAKE_DL_LIBS} + PRIVATE OPS_Tcl OpenSees ${OPS_Element_List} ${CMAKE_DL_LIBS} ) #---------------------------- diff --git a/Conf.cmake b/Conf.cmake index 1ae7d5f06..ea3f5d7fa 100644 --- a/Conf.cmake +++ b/Conf.cmake @@ -116,12 +116,12 @@ set(OPS_Element_List OPS_Element_absorbentBoundaries OPS_Element_adapter OPS_Element_beam3d - OPS_Element_beamWithHinges + #OPS_Element_beamWithHinges OPS_Element_catenaryCable OPS_Element_componentElement OPS_Element_dispBeamColumnInt OPS_Element_elastomericBearing - OPS_Element_feap + #OPS_Element_feap OPS_Element_frictionBearing OPS_Element_generic OPS_Element_gradientInelasticBeamColumn @@ -129,7 +129,7 @@ set(OPS_Element_List OPS_Element_LHMYS OPS_Element_mixedBeamColumn OPS_Element_mvlem - OPS_Element_PFEMElement + #OPS_Element_PFEMElement OPS_Element_PML OPS_Element_pyMacro OPS_Element_RockingBC diff --git a/SRC/material/uniaxial/backbone/CMakeLists.txt b/SRC/material/uniaxial/backbone/CMakeLists.txt index ac7aae177..3e7570237 100644 --- a/SRC/material/uniaxial/backbone/CMakeLists.txt +++ b/SRC/material/uniaxial/backbone/CMakeLists.txt @@ -1,11 +1,31 @@ target_sources(OPS_Material PRIVATE - + ArctangentBackbone.cpp + CappedBackbone.cpp + HystereticBackbone.cpp + LinearCappedBackbone.cpp + ManderBackbone.cpp + MaterialBackbone.cpp + MultilinearBackbone.cpp + RaynorBackbone.cpp + ReeseSandBackbone.cpp + ReeseSoftClayBackbone.cpp + ReeseStiffClayBelowWS.cpp + TrilinearBackbone.cpp PUBLIC - + ArctangentBackbone.h + CappedBackbone.h + HystereticBackbone.h + LinearCappedBackbone.h + ManderBackbone.h + MaterialBackbone.h + MultilinearBackbone.h + RaynorBackbone.h + ReeseSandBackbone.h + ReeseSoftClayBackbone.h + ReeseStiffClayBelowWS.h + TrilinearBackbone.h ) - target_include_directories(OPS_Material PUBLIC $(CMAKE_CURRENT_LIST_DIR)) - diff --git a/SRC/material/uniaxial/fedeas/CMakeLists.txt b/SRC/material/uniaxial/fedeas/CMakeLists.txt index ac7aae177..e0a40986f 100644 --- a/SRC/material/uniaxial/fedeas/CMakeLists.txt +++ b/SRC/material/uniaxial/fedeas/CMakeLists.txt @@ -1,11 +1,32 @@ target_sources(OPS_Material PRIVATE - + FedeasBond1Material.cpp + FedeasBond2Material.cpp + FedeasConcr1Material.cpp + FedeasConcr2Material.cpp + FedeasConcr3Material.cpp + FedeasHardeningMaterial.cpp + FedeasHyster1Material.cpp + FedeasHyster2Material.cpp + FedeasSteel1Material.cpp + FedeasSteel2Material.cpp + Hard1.f + PD1.c + PD1.f + PlasticDamageMaterial.cpp PUBLIC - + FedeasBond1Material.h + FedeasBond2Material.h + FedeasConcr1Material.h + FedeasConcr2Material.h + FedeasConcr3Material.h + FedeasHardeningMaterial.h + FedeasHyster1Material.h + FedeasHyster2Material.h + FedeasSteel1Material.h + FedeasSteel2Material.h + PlasticDamageMaterial.h ) - target_include_directories(OPS_Material PUBLIC $(CMAKE_CURRENT_LIST_DIR)) - diff --git a/SRC/material/uniaxial/limitState/CMakeLists.txt b/SRC/material/uniaxial/limitState/CMakeLists.txt index ac7aae177..934130f79 100644 --- a/SRC/material/uniaxial/limitState/CMakeLists.txt +++ b/SRC/material/uniaxial/limitState/CMakeLists.txt @@ -1,11 +1,12 @@ target_sources(OPS_Material PRIVATE - + LimitStateMaterial.cpp + PinchingLimitStateMaterial.cpp PUBLIC - + LimitStateMaterial.h + PinchingLimitStateMaterial.h ) - target_include_directories(OPS_Material PUBLIC $(CMAKE_CURRENT_LIST_DIR)) - +add_subdirectory(./limitCurve/) diff --git a/SRC/material/uniaxial/limitState/limitCurve/CMakeLists.txt b/SRC/material/uniaxial/limitState/limitCurve/CMakeLists.txt new file mode 100644 index 000000000..7cf376c88 --- /dev/null +++ b/SRC/material/uniaxial/limitState/limitCurve/CMakeLists.txt @@ -0,0 +1,19 @@ + +target_sources(OPS_Material + PRIVATE + AxialCurve.cpp + LimitCurve.cpp + RotationShearCurve.cpp + ShearCurve.cpp + ThreePointCurve.cpp + WrapperLimitCurve.cpp + PUBLIC + AxialCurve.h + LimitCurve.h + RotationShearCurve.h + ShearCurve.h + ThreePointCurve.h + WrapperLimitCurve.h +) +target_include_directories(OPS_Material PUBLIC $(CMAKE_CURRENT_LIST_DIR)) + diff --git a/SRC/material/uniaxial/stiffness/CMakeLists.txt b/SRC/material/uniaxial/stiffness/CMakeLists.txt index ac7aae177..010362a48 100644 --- a/SRC/material/uniaxial/stiffness/CMakeLists.txt +++ b/SRC/material/uniaxial/stiffness/CMakeLists.txt @@ -1,11 +1,17 @@ target_sources(OPS_Material PRIVATE - + ConstantStiffnessDegradation.cpp + DuctilityStiffnessDegradation.cpp + EnergyStiffnessDegradation.cpp + PincheiraStiffnessDegradation.cpp + StiffnessDegradation.cpp PUBLIC - + ConstantStiffnessDegradation.h + DuctilityStiffnessDegradation.h + EnergyStiffnessDegradation.h + PincheiraStiffnessDegradation.h + StiffnessDegradation.h ) - target_include_directories(OPS_Material PUBLIC $(CMAKE_CURRENT_LIST_DIR)) -