From c13d1ca4f608f3668277ef2714e1a70419e0fc71 Mon Sep 17 00:00:00 2001 From: Matthias Neuner Date: Thu, 9 Feb 2023 13:42:00 +0100 Subject: [PATCH 1/6] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1bd29143..62d6d1b5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -35,7 +35,7 @@ variables: build and test: stage: build - image: condaforge/mambaforge:latest + image: condaforge/mambaforge:22.9.0-2 script: - function install_marmot_module(){ From 62de07330a05a60649567143f948ce408844c892 Mon Sep 17 00:00:00 2001 From: Dummer Alexander Date: Wed, 22 Mar 2023 14:34:01 +0100 Subject: [PATCH 2/6] autodiff displacement finite element --- CMakeLists.txt | 3 +++ include/Marmot/Marmot.h | 11 +++++++++++ modules/core/MarmotMechanicsCore | 2 +- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5325c71f..398320c9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -114,6 +114,8 @@ endif() if(NOT MATERIAL_MODULES OR MATERIAL_MODULES STREQUAL "all") set (MATERIAL_MODULES + ADLinearElastic + ADVonMises B4 Barodesy BarodesyGradientVoid @@ -186,6 +188,7 @@ if(NOT ELEMENT_MODULES OR ELEMENT_MODULES STREQUAL "all") set(ELEMENT_MODULES CosseratFiniteElement DisplacementFiniteElement + ADDisplacementFiniteElement DisplacementTLFiniteElement DisplacementULFiniteElement DisplacementEASFiniteElement diff --git a/include/Marmot/Marmot.h b/include/Marmot/Marmot.h index eb8fdf6e..6cf54a5a 100644 --- a/include/Marmot/Marmot.h +++ b/include/Marmot/Marmot.h @@ -101,6 +101,8 @@ namespace MarmotLibrary { RedWildmoorSandstone = 63, VonMises = 64, GradientEnhancedCosseratDruckerPrager = 65, + ADLinearElastic = 66, + ADVonMises = 67, }; enum ElementCode { @@ -259,6 +261,15 @@ namespace MarmotLibrary { CHMCPE4UL, CHMCPE8RUL, CHMC3D20RUL, + + // autodiff displacement elements + ADCPE4, + ADCPE8R, + ADCPS4, + ADCPS8R, + ADC3D8, + ADC3D20, + ADC3D20R, }; // MaterialFactory diff --git a/modules/core/MarmotMechanicsCore b/modules/core/MarmotMechanicsCore index aa41dc52..1e57dea0 160000 --- a/modules/core/MarmotMechanicsCore +++ b/modules/core/MarmotMechanicsCore @@ -1 +1 @@ -Subproject commit aa41dc520cb7dfa3b32195802214efc5546a5b1d +Subproject commit 1e57dea017e51b68ee2f98c00e71b1cabb9217d9 From 9c742b0f98553cde65cc441101d68b7310386607 Mon Sep 17 00:00:00 2001 From: Dummer Alexander Date: Thu, 23 Mar 2023 08:46:34 +0100 Subject: [PATCH 3/6] add ADRedWildmoorSandstone and NDRedWildmoorSandstone material models --- .gitlab-ci.yml | 20 +++++++++++--------- CMakeLists.txt | 2 ++ include/Marmot/Marmot.h | 2 ++ include/Marmot/MarmotJournal.h | 2 +- modules/core/MarmotMathCore | 2 +- modules/core/MarmotMechanicsCore | 2 +- modules/materials/VonMises | 2 +- 7 files changed, 19 insertions(+), 13 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 62d6d1b5..396b7e70 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -32,7 +32,17 @@ variables: LinearElastic $LinearElastic_Repo master B4 $B4_Repo master VonMises $VonMises_Repo master - + +format: + stage: test + image: condaforge/mambaforge:22.9.0-2 + needs: [] + script: + - mamba install -c conda-forge clang-format-15 + - find . \( -name \*.cpp -o -name \*.h \) -print0 | xargs -0 -n 1 clang-format-15 --Werror -n --verbose + only: + - merge_requests + build and test: stage: build image: condaforge/mambaforge:22.9.0-2 @@ -109,12 +119,4 @@ build and test: - python setup.py build_ext -i - python run_tests.py -format: - stage: test - image: nexus.lumiplan.com:8443/toolchain/clang-format:13 - needs: [] - script: - - find . \( -name \*.cpp -o -name \*.h \) -print0 | xargs -0 -n 1 clang-format-13 --Werror -n --verbose - only: - - merge_requests diff --git a/CMakeLists.txt b/CMakeLists.txt index 398320c9..60c85feb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -162,6 +162,8 @@ if(NOT MATERIAL_MODULES OR MATERIAL_MODULES STREQUAL "all") ViscoPlasticShotcreteModel VonMises PorousElastic + ADRedWildmoorSandstone + NDRedWildmoorSandstone RedWildmoorSandstone RockDamagePlasticity RockDamagePlasticityNonLocal diff --git a/include/Marmot/Marmot.h b/include/Marmot/Marmot.h index 6cf54a5a..1c8cd2e5 100644 --- a/include/Marmot/Marmot.h +++ b/include/Marmot/Marmot.h @@ -103,6 +103,8 @@ namespace MarmotLibrary { GradientEnhancedCosseratDruckerPrager = 65, ADLinearElastic = 66, ADVonMises = 67, + ADRedWildmoorSandstone = 68, + NDRedWildmoorSandstone = 69, }; enum ElementCode { diff --git a/include/Marmot/MarmotJournal.h b/include/Marmot/MarmotJournal.h index dc6a1085..0650591b 100644 --- a/include/Marmot/MarmotJournal.h +++ b/include/Marmot/MarmotJournal.h @@ -51,7 +51,7 @@ class MarmotJournal { MarmotJournal(); public: - MarmotJournal( MarmotJournal const& ) = delete; + MarmotJournal( MarmotJournal const& ) = delete; void operator=( MarmotJournal const& ) = delete; static void setMSGOutputDirection( std::ostream& newOutputStream ); diff --git a/modules/core/MarmotMathCore b/modules/core/MarmotMathCore index aceb85b1..d2d4a384 160000 --- a/modules/core/MarmotMathCore +++ b/modules/core/MarmotMathCore @@ -1 +1 @@ -Subproject commit aceb85b181bf3f3234ac2ef27f9a01edbbb4eeb5 +Subproject commit d2d4a38411ed6ceff3e5c079a4d6527fb2c88900 diff --git a/modules/core/MarmotMechanicsCore b/modules/core/MarmotMechanicsCore index 1e57dea0..34c46637 160000 --- a/modules/core/MarmotMechanicsCore +++ b/modules/core/MarmotMechanicsCore @@ -1 +1 @@ -Subproject commit 1e57dea017e51b68ee2f98c00e71b1cabb9217d9 +Subproject commit 34c466372dac34c2567efb20b95f903d44290b1c diff --git a/modules/materials/VonMises b/modules/materials/VonMises index 08987282..172cf4be 160000 --- a/modules/materials/VonMises +++ b/modules/materials/VonMises @@ -1 +1 @@ -Subproject commit 08987282eba51bcad2b57dbe7db36fbcc7940913 +Subproject commit 172cf4be133715759dd3860f7fafbe6081106564 From 1e3a20f5326804ff9b29c5b900a80cd5ce03e0d4 Mon Sep 17 00:00:00 2001 From: Dummer Alexander Date: Thu, 23 Mar 2023 08:49:36 +0100 Subject: [PATCH 4/6] change to clang-format 15.0.7 --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 9d9f9da4..beb26fcc 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,6 +1,6 @@ repos: - repo: https://github.com/pre-commit/mirrors-clang-format - rev: v14.0.0 + rev: v15.0.7 hooks: - id: clang-format args: ["--dry-run", "--Werror" ] From 7f5276cc8e55854c9e0446ad543617e840247049 Mon Sep 17 00:00:00 2001 From: Dummer Alexander Date: Fri, 24 Mar 2023 10:51:46 +0100 Subject: [PATCH 5/6] update submodule commits --- modules/core/MarmotFiniteElementCore | 2 +- modules/core/MarmotMathCore | 2 +- modules/core/MarmotMechanicsCore | 2 +- modules/materials/VonMises | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/core/MarmotFiniteElementCore b/modules/core/MarmotFiniteElementCore index 223de4d5..e9719cff 160000 --- a/modules/core/MarmotFiniteElementCore +++ b/modules/core/MarmotFiniteElementCore @@ -1 +1 @@ -Subproject commit 223de4d518bba4a10388a1f410228de52efc472a +Subproject commit e9719cff7420cade144e2e1e63804910a98b6dd8 diff --git a/modules/core/MarmotMathCore b/modules/core/MarmotMathCore index d2d4a384..1e8aa45b 160000 --- a/modules/core/MarmotMathCore +++ b/modules/core/MarmotMathCore @@ -1 +1 @@ -Subproject commit d2d4a38411ed6ceff3e5c079a4d6527fb2c88900 +Subproject commit 1e8aa45b9fab66413d08065d70ea9b1f89c81540 diff --git a/modules/core/MarmotMechanicsCore b/modules/core/MarmotMechanicsCore index 34c46637..69a5e1a2 160000 --- a/modules/core/MarmotMechanicsCore +++ b/modules/core/MarmotMechanicsCore @@ -1 +1 @@ -Subproject commit 34c466372dac34c2567efb20b95f903d44290b1c +Subproject commit 69a5e1a2cb16c81af0e1848fdd7e947b461e78e9 diff --git a/modules/materials/VonMises b/modules/materials/VonMises index 172cf4be..9db4b972 160000 --- a/modules/materials/VonMises +++ b/modules/materials/VonMises @@ -1 +1 @@ -Subproject commit 172cf4be133715759dd3860f7fafbe6081106564 +Subproject commit 9db4b972fae7b030c5988f1f31808dc4a243d49e From e2c2eda53fb28843991730c3ee7d87a191511c50 Mon Sep 17 00:00:00 2001 From: Dummer Alexander Date: Fri, 24 Mar 2023 10:59:05 +0100 Subject: [PATCH 6/6] update submodule commits --- modules/core/MarmotMathCore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/core/MarmotMathCore b/modules/core/MarmotMathCore index 1e8aa45b..9810074c 160000 --- a/modules/core/MarmotMathCore +++ b/modules/core/MarmotMathCore @@ -1 +1 @@ -Subproject commit 1e8aa45b9fab66413d08065d70ea9b1f89c81540 +Subproject commit 9810074cfc1c86851f00168d019a504901d865d4