conflicts
Showing
- README.md 3 additions, 2 deletionsREADME.md
- srcs/BEM/mainBEM.cpp 1 addition, 0 deletionssrcs/BEM/mainBEM.cpp
- srcs/BEM/postProcessing.cpp 5 additions, 2 deletionssrcs/BEM/postProcessing.cpp
- srcs/FEM/complex_validation.geo 2 additions, 4 deletionssrcs/FEM/complex_validation.geo
- srcs/FEM/hybrid_complex.geo 9 additions, 9 deletionssrcs/FEM/hybrid_complex.geo
- srcs/FEM/hybrid_geo.geo 8 additions, 6 deletionssrcs/FEM/hybrid_geo.geo
- srcs/FEM/large_rotation_validation.geo 2 additions, 4 deletionssrcs/FEM/large_rotation_validation.geo
- srcs/FEM/large_rotation_validation_single_surface.geo 2 additions, 0 deletionssrcs/FEM/large_rotation_validation_single_surface.geo
- srcs/FEM/self_weight.geo 2 additions, 2 deletionssrcs/FEM/self_weight.geo
- srcs/FEM/simple_tension.geo 6 additions, 8 deletionssrcs/FEM/simple_tension.geo
- srcs/FEM/solverFEM.cpp 6 additions, 3 deletionssrcs/FEM/solverFEM.cpp
- srcs/FEM/uniform_charge.geo 12 additions, 13 deletionssrcs/FEM/uniform_charge.geo
- srcs/FoldedFlexureBeam.geo 37 additions, 39 deletionssrcs/FoldedFlexureBeam.geo
- srcs/MEMS.geo 2 additions, 2 deletionssrcs/MEMS.geo
- srcs/beamActuation.geo 2 additions, 0 deletionssrcs/beamActuation.geo
- srcs/beamActuationGeneral.geo 0 additions, 229 deletionssrcs/beamActuationGeneral.geo
- srcs/clampedMicroBeam.geo 5 additions, 5 deletionssrcs/clampedMicroBeam.geo
- srcs/coupling_validation.geo 3 additions, 3 deletionssrcs/coupling_validation.geo
- srcs/hybrid_geo.geo 10 additions, 11 deletionssrcs/hybrid_geo.geo
- srcs/longitudinalCombDevice.geo 9 additions, 5 deletionssrcs/longitudinalCombDevice.geo
Loading
Please register or sign in to comment