fix conflict
Description
Description
Details
Details
- Committed
saduruss Sep 28 2023, 16:31 - Pushed
gitlab-richart Oct 3 2023, 09:19 - Parents
- rAKA3be830a7a67e: Merge branch 'features/changes-to-address-joss-review' of gitlab.com…
rAKA58cff193772f: phase-field c++ example - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
Commit | Author | Details | Committed | |||
---|---|---|---|---|---|---|
3be830a7a67e | rferry | Merge branch 'features/changes-to-address-joss-review' of gitlab.com… | Sep 28 2023 | |||
92294d60b0f3 | rferry | parallel example | Sep 28 2023 | |||
bef9a046a233 | richart | Correcting nammings and compilation error | Sep 28 2023 | |||
d6dc8dd6c426 | richart | Merge remote-tracking branch 'origin/master' into features/changes-to-address… | Sep 27 2023 | |||
7ad57cd90f65 | richart | Merge branch 'features/make_multiple_materials_independant_solid_mechanics'… | Sep 27 2023 | |||
0e8e4e917704 | richart | parentheses for multiline | Sep 14 2023 | |||
bdf80c2c5137 | richart | more missing changes | Sep 14 2023 | |||
73d9497cc7ba | richart | Missing changes in damage non local | Sep 14 2023 | |||
d96fd9e6de8f | richart | Bug fix in the constructor order | Sep 14 2023 | |||
867bc5f52eed | richart | restoring test | Sep 14 2023 | |||
7cf2965a2846 | richart | Switching to shared_ptr to correct undefined behaviors in the the python… | Sep 14 2023 | |||
312a347ad723 | richart | Renaming compilation profile | Sep 14 2023 | |||
67530890544a | richart | Missing python interfaces [still a bug with internals in python] | Sep 13 2023 | |||
c8e866554c97 | richart | Bug fix in the coupler interface | Sep 12 2023 | |||
391e62fd5b50 | richart | Cleaning a bit the compilation variants | Sep 12 2023 | |||
254edd750e3a | richart | Merge branch 'master' into features/make_multiple_materials_independant_solid_m… | Sep 12 2023 | |||
dfb828d369b1 | Nicolas Richart | Typo in the diffusion package | Aug 2 2023 | |||
5b14b292ffd6 | Nicolas Richart | Merge branch 'master' into features/make_multiple_materials_independant_solid_m… | Aug 2 2023 | |||
c5ba2fb756f3 | Nicolas Richart | Changing the default package name in cmake | Aug 2 2023 | |||
fb1f70bc20e0 | Nicolas Richart | Bug fixes cohesive elements | Aug 1 2023 | |||
0b5b06918b93 | Nicolas Richart | Fixing bugs and adding missing python interface | Jul 28 2023 | |||
4ad6a31e0a1a | Nicolas Richart | Moving heat transfer to diffusion model | Jul 25 2023 | |||
a91fc673e8e7 | Nicolas Richart | [wip] Solved compilation issues | Jul 21 2023 | |||
3ef774152252 | Nicolas Richart | Adding missing python interface and linting | Jul 20 2023 | |||
6c458a3a0a37 | Nicolas Richart | Adding missing python interface and linting | Jul 20 2023 | |||
cd4ab7137869 | Nicolas Richart | Fixing buges and reverting on registerInternal | Jul 20 2023 | |||
378e70d38150 | Nicolas Richart | [wip] Reaching a compiling point need to debug now | Jul 14 2023 | |||
843d4082f874 | Nicolas Richart | [wip] Changing more internalfields to shared_ptr | Apr 13 2023 | |||
49129e76fff7 | Nicolas Richart | Merge remote-tracking branch 'origin/master' into… | Apr 11 2023 | |||
68a3bb87fbbb | Nicolas Richart | [wip] changing internal fields to std::shared_ptr [ci.skip] | Apr 11 2023 | |||
adcfbd6d923f | Nicolas Richart | Removing the material list generator | Mar 7 2023 | |||
5c7ea5a6ccda | Nicolas Richart | [wip] Making the branch compile after a rebase [ci.skip] | Mar 7 2023 | |||
4885348a2272 | richart/Nicolas Richart | solving ambiguity | Feb 25 2023 | |||
c172a5f9a05d | richart/Nicolas Richart | Submit for testing | Feb 25 2023 | |||
b72e9e25088c | richart/Nicolas Richart | Advancing in compilation problems | Feb 25 2023 | |||
8cdb3c79e7e3 | pundir/Nicolas Richart | moved spatial dimension to the base class | Feb 25 2023 | |||
767c467331c8 | richart/Nicolas Richart | fixing compilations issues | Feb 25 2023 | |||
cea4f240e60d | richart/Nicolas Richart | Adding base interfaces | Feb 25 2023 | |||
4287921e5d9b | richart/Nicolas Richart | Making internal fields more generic | Feb 25 2023 | |||
79c57454cc30 | pundir/Nicolas Richart | few more modifications | Feb 25 2023 | |||
3719412e4978 | pundir/Nicolas Richart | changes to the internal field | Feb 25 2023 | |||
a37413ca05a9 | richart/Nicolas Richart | Advancing more | Feb 25 2023 | |||
8344be23f1d0 | richart/Nicolas Richart | Advancing in the compilation | Feb 25 2023 | |||
b26e7d2721d2 | richart/Nicolas Richart | renaming files | Feb 25 2023 | |||
31237a41d460 | pundir/Nicolas Richart | constitutive laws added | Feb 25 2023 | |||
b87c359bde50 | richart/Nicolas Richart | extracting constitutive laws handler from solid mechanics | Feb 25 2023 | |||
3da4fa0673a2 | richart/Nicolas Richart | Moving internal fields to generic consitutive laws | Feb 25 2023 |