Merge branch 'master' into 'fix_compiler_error_with_onedgrid'
# Conflicts: # dune/gfe/geodesicfefunctionadaptor.hh
No related branches found
No related tags found
Showing
- .gitlab-ci.yml 8 additions, 7 deletions.gitlab-ci.yml
- CMakeLists.txt 2 additions, 2 deletionsCMakeLists.txt
- dune-gfe.pc.in 3 additions, 2 deletionsdune-gfe.pc.in
- dune.module 5 additions, 5 deletionsdune.module
- dune/gfe/CMakeLists.txt 1 addition, 2 deletionsdune/gfe/CMakeLists.txt
- dune/gfe/averagedistanceassembler.hh 1 addition, 15 deletionsdune/gfe/averagedistanceassembler.hh
- dune/gfe/averageinterface.hh 3 additions, 1 deletiondune/gfe/averageinterface.hh
- dune/gfe/cosseratenergystiffness.hh 2 additions, 2 deletionsdune/gfe/cosseratenergystiffness.hh
- dune/gfe/cosseratvtkwriter.hh 138 additions, 8 deletionsdune/gfe/cosseratvtkwriter.hh
- dune/gfe/embeddedglobalgfefunction.hh 20 additions, 3 deletionsdune/gfe/embeddedglobalgfefunction.hh
- dune/gfe/geodesicfeassembler.hh 49 additions, 1 deletiondune/gfe/geodesicfeassembler.hh
- dune/gfe/harmonicenergystiffness.hh 12 additions, 12 deletionsdune/gfe/harmonicenergystiffness.hh
- dune/gfe/localgeodesicfefunction.hh 16 additions, 18 deletionsdune/gfe/localgeodesicfefunction.hh
- dune/gfe/localgfetestfunctionbasis.hh 1 addition, 1 deletiondune/gfe/localgfetestfunctionbasis.hh
- dune/gfe/localquickanddirtyfefunction.hh 47 additions, 4 deletionsdune/gfe/localquickanddirtyfefunction.hh
- dune/gfe/mixedgfeassembler.hh 52 additions, 0 deletionsdune/gfe/mixedgfeassembler.hh
- dune/gfe/mixedriemanniantrsolver.cc 34 additions, 40 deletionsdune/gfe/mixedriemanniantrsolver.cc
- dune/gfe/mixedriemanniantrsolver.hh 2 additions, 2 deletionsdune/gfe/mixedriemanniantrsolver.hh
- dune/gfe/nonplanarcosseratshellenergy.hh 14 additions, 11 deletionsdune/gfe/nonplanarcosseratshellenergy.hh
- dune/gfe/parallel/globalp1mapper.hh 0 additions, 5 deletionsdune/gfe/parallel/globalp1mapper.hh
Loading
Please register or sign in to comment