merge master edelweissFE

Author: thomas

.github/workflows/run_tests.yml

@@ -10,13 +10,13 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: Setup Mambaforge
-        uses: conda-incubator/setup-miniconda@v2
+        uses: conda-incubator/setup-miniconda@v3
         with:
           use-mamba: true
-          miniforge-variant: Mambaforge
+          miniforge-variant: Miniforge3
           miniforge-version: latest
           activate-environment: anaconda-client-env
-              
+
       - name: Install conda packages
         shell: bash -l {0}
         run: |
@@ -27,9 +27,9 @@ jobs:
         shell: bash -l {0}
         run: |
           git clone --branch 3.4.0 https://gitlab.com/libeigen/eigen.git
-          cd eigen 
+          cd eigen
           mkdir build
-          cd build 
+          cd build
           cmake -DBUILD_TESTING=OFF -DCMAKE_INSTALL_PREFIX=$CONDA_PREFIX -DINCLUDE_INSTALL_DIR=$CONDA_PREFIX/include ..
           make install
           cd ../..
@@ -57,16 +57,13 @@ jobs:
       - name: Install Marmot
         shell: bash -l {0}
         run: |
-          git clone --recurse-submodules https://github.com/MAteRialMOdelingToolbox/Marmot/
-          cd Marmot
-          cd modules/core
-          git clone ${{secrets.MARMOT_MPMCORE_TOKEN}}
-          cd ../../
-          mkdir build
-          cd build
+          git clone "https://github.com/MAteRialMOdelingToolbox/Marmot.git"
+          git clone "https://github.com/BOKU-CMP-MEC-MAT/MarmotMeshfreeCore.git" ./Marmot/modules/core/MarmotMeshfreeCore
+          mkdir ./Marmot/build
+          cd ./Marmot/build
           cmake -DCMAKE_INSTALL_PREFIX=$CONDA_PREFIX  ..
           make install
-          cd ../../
+          cd ../..
 
       - name: Install EdelweissFE
         shell: bash -l {0}

README.md

@@ -1,5 +1,5 @@
 <!-- [![documentation](https://github.com/EdelweissMPM/EdelweissMPM/actions/workflows/sphinx.yml/badge.svg)](https://edelweissfe.github.io/EdelweissMPM) -->
-[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black) 
+[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
 
 # EdelweissMPM: A light-weight, platform-independent, parallel material point module for EdelweissFE.
 
@@ -14,7 +14,7 @@ Some features are:
 
  * Python for non performance-critical routines
  * Cython for performance-critical routines
- * Parallelization 
+ * Parallelization
  * Modular system, which is easy to extend
  * Output to Paraview, Ensight, CSV, matplotlib
  * Interfaces to powerful direct and iterative linear solvers

…ocumentation/material_point_managers.rst …entation/mpm/material_point_managers.rstdoc/source/documentation/material_point_managers.rst renamed to doc/source/documentation/mpm/material_point_managers.rst doc/source/documentation/material_point_managers.rst renamed to doc/source/documentation/mpm/material_point_managers.rst

@@ -18,5 +18,5 @@ Smart Material Point Manager
 .. automodule:: edelweissmpm.mpmmanagers.smartmpmmanager
    :private-members:
    :members:
-   
-   
+
+

…source/documentation/material_points.rst …ce/documentation/mpm/material_points.rstdoc/source/documentation/material_points.rst renamed to doc/source/documentation/mpm/material_points.rst doc/source/documentation/material_points.rst renamed to doc/source/documentation/mpm/material_points.rst

@@ -9,7 +9,7 @@ EdelweissMPM aims to be...
 
  - ... a development and learning environment for constitutive models and the material point method,
  - ... an easy to use tool for coupled problems,
- - ... a very flexible tool for implementing and employing special techniques (e.g., the indirect displacement control technique), 
+ - ... a very flexible tool for implementing and employing special techniques (e.g., the indirect displacement control technique),
    which are often more difficult and time consuming to implement in mature, MPI-parallelized codes,
  - ... an efficient tool for nonlinear simulations up to medium sized problems (~ :math:`10^5` degrees of freedom).
 

doc/source/index.rst

@@ -30,7 +30,7 @@
 to the material points. Cells are used to compute the residual and stiffness
 matrices for the global system of equations.
 
-Implementing your own cells can be done easily by subclassing from 
+Implementing your own cells can be done easily by subclassing from
 the abstract base class :class:`~CellBase`.
 """
 

edelweissmpm/cells/base/cell.py

@@ -90,7 +90,7 @@ cdef class BSplineMarmotCellWrapper(MarmotCellWrapper):
                                                                     &knotVectorsView[0,0],
                                                                     knotVectorsView.size)
 
-        except IndexError:
+        except ValueError:
             raise NotImplementedError("Marmot cell {:} not found in library.".format(cellType))
 
     def __dealloc__(self):

edelweissmpm/cells/marmotcell/bsplinemarmotcell.pyx

@@ -87,7 +87,7 @@ cdef class LagrangianMarmotCellWrapper(MarmotCellWrapper):
 
         try:
             self._marmotCell = MarmotCellFactory.createCell( cellType.encode('utf-8'), self._cellNumber, &self._nodeCoordinates[0,0], self._nodeCoordinates.size)
-        except IndexError:
+        except ValueError:
             raise NotImplementedError("Marmot cell {:} not found in library.".format(cellType))
 
     def __dealloc__(self):

edelweissmpm/cells/marmotcell/lagrangianmarmotcell.pyx

@@ -25,7 +25,7 @@
 #  the top level directory of EdelweissMPM.
 #  ---------------------------------------------------------------------
 """
-Implementing your own cells can be done easily by subclassing from 
+Implementing your own cells can be done easily by subclassing from
 the abstract base class :class:`~CellBase`.
 """
 

edelweissmpm/cells/test/cell.py

@@ -34,24 +34,35 @@ def __init__(
         self,
         name: str,
         constrainedParticle: BaseParticle,
-        constrainedLocation: int | str,
         field: str,
         prescribedStepDelta: dict,
         model,
+        location: str = "center",
+        faceID: int = None,
+        vertexID: int = None,
     ):
         self._name = name
         self._constrainedParticle = constrainedParticle
         self._field = field
         self._prescribedStepDelta = prescribedStepDelta
         self._fieldSize = getFieldSize(self._field, model.domainSize)
         self._nodes = dict()
-        self._constrainedLocation = constrainedLocation
 
-        if isinstance(constrainedLocation, str):
-            if constrainedLocation != "center":
-                raise ValueError("Constrain must be 'center' or a vertex index.")
-        # elif isinstance(constrainedLocation, int):
-        #     raise ValueError(f"Constrain must be 'center' or a vertex index, got {type(constrainedLocation)}.")
+        def _getConstraintLocation():
+            particle = self._constrainedParticle
+            if location == "center":
+                constraintLocation = particle.getCenterCoordinates()
+            elif location == "face":
+                if faceID is None:
+                    raise ValueError("faceID must be specified when location is 'face'.")
+                constraintLocation = particle.getFaceCoordinates(faceID)
+            elif location == "vertex":
+                if vertexID is None:
+                    raise ValueError("vertexID must be specified when location is 'vertex'.")
+                constraintLocation = particle.getVertexCoordinates(vertexID)
+            return constraintLocation
+
+        self._getConstraintLocation = _getConstraintLocation
 
         self._nLagrangianMultipliers = len(self._prescribedStepDelta)
         self.reactionForce = np.zeros(self._fieldSize)
@@ -119,10 +130,12 @@ def applyConstraint(self, dU_: np.ndarray, PExt: np.ndarray, V: np.ndarray, time
         self.reactionForce.fill(0.0)
         p = self._constrainedParticle
 
-        if self._constrainedLocation == "center":
-            constrainedCoordinates = p.getCenterCoordinates()
-        elif isinstance(self._constrainedLocation, int):
-            constrainedCoordinates = p.getVertexCoordinates()[self._constrainedLocation]
+        # if self._constrainedLocation == "center":
+        #     constrainedCoordinates = p.getCenterCoordinates()
+        # elif isinstance(self._constrainedLocation, int):
+        #     constrainedCoordinates = p.getVertexCoordinates()[self._constrainedLocation]
+
+        constrainedCoordinates = self._getConstraintLocation()
 
         for lag, (i, prescribedComponent) in enumerate(self._prescribedStepDelta.items()):
             # lag is the lagrange multiplier index
@@ -158,23 +171,27 @@ def applyConstraint(self, dU_: np.ndarray, PExt: np.ndarray, V: np.ndarray, time
 def ParticleLagrangianWeakDirichletOnParticleSetFactory(
     baseName: str,
     particleSet: list[BaseParticle],
-    constrainedLocation: list[int] | str,
     field: str,
     prescribedStepDelta: dict,
     model: MPMModel,
+    location: str = "center",
+    faceID: int = None,
+    vertexID: int | list[int] = None,
 ):
     constraints = dict()
     for i, p in enumerate(particleSet):
-        if isinstance(constrainedLocation, list):
-            for vertIdx in constrainedLocation:
-                name = f"{baseName}_{i}_{vertIdx}"
-                constraint = ParticleLagrangianWeakDirichlet(
-                    name, p, vertIdx, field, prescribedStepDelta, model
-                )
+        if location == "vertex":
+            if isinstance(vertexID, int):
+                name = f"{baseName}_{i}_v{vertexID}"
+                constraint = ParticleLagrangianWeakDirichlet( name, p, field, prescribedStepDelta, model, location, faceID, vertexID)
                 constraints[name] = constraint
-        else:   
+            else:
+                for vertIdx in vertexID:
+                    name = f"{baseName}_{i}_v{vertIdx}"
+                    constraint = ParticleLagrangianWeakDirichlet( name, p, field, prescribedStepDelta, model, location, faceID, vertIdx)
+                    constraints[name] = constraint
+        else:
             name = f"{baseName}_{i}"
-            constraint = ParticleLagrangianWeakDirichlet(name, p, constrainedLocation, field, prescribedStepDelta, model)
+            constraint = ParticleLagrangianWeakDirichlet( name, p, field, prescribedStepDelta, model, location, faceID, vertexID)
             constraints[name] = constraint
-
     return constraints