diff --git a/dune/microstructure/EffectiveQuantitiesComputer.hh b/dune/microstructure/EffectiveQuantitiesComputer.hh index d9f597b48437617f283d4960b95e811000b3e7f2..d704637f478280e6059d4e88c58b5c74ca898c48 100644 --- a/dune/microstructure/EffectiveQuantitiesComputer.hh +++ b/dune/microstructure/EffectiveQuantitiesComputer.hh @@ -177,7 +177,7 @@ public: if (b==0) { auto prestrainPhaseValue = prestrain_(localIndicatorFunction(quadPos)); - elementPrestrain += scalarProduct(material_.ElasticityTensor(X1,localIndicatorFunction(quadPos)),sym(prestrainPhaseValue)); + elementPrestrain += scalarProduct(material_.ElasticityTensor(X1,localIndicatorFunction(quadPos)),sym(prestrainPhaseValue)) * quadPoint.weight() * integrationElement; // elementPrestrain += linearizedStVenantKirchhoffDensity(mu(quadPos), lambda(quadPos), X1, prestrainFunctional(quadPos)) * quadPoint.weight() * integrationElement; } } @@ -226,7 +226,7 @@ public: // --- write Data to Matlab / Optimization-Code void writeToMatlab(std::string outputPath) { - std::cout << "write effective quantities to Matlab folder..." << std::endl; + std::cout << "write effective quantities as .txt files to output folder..." << std::endl; //writeMatrixToMatlab(Q, "../../Matlab-Programs/QMatrix.txt"); writeMatrixToMatlab(Qeff_, outputPath + "/QMatrix.txt"); // write effective Prestrain in Matrix for Output diff --git a/inputs/cellsolver.parset b/inputs/cellsolver.parset index 7db3997ed4d640f52e737e9b06be62b938657987..163ae6c4cef4e4e4ae0580c902631674620e9371 100644 --- a/inputs/cellsolver.parset +++ b/inputs/cellsolver.parset @@ -13,7 +13,7 @@ outputPath=/home/klaus/Desktop/Dune-Testing/dune-microstructure/outputs # --- DEBUG (Output) Option: -print_debug = true #(default=false) +#print_debug = true #(default=false) ############################################# @@ -24,7 +24,7 @@ print_debug = true #(default=false) ## {start,finish} computes on all grid from 2^(start) to 2^finish refinement #---------------------------------------------------- -numLevels= 2 2 # computes all levels from first to second entry +numLevels= 2 3 # computes all levels from first to second entry ############################################# @@ -44,12 +44,6 @@ gamma=1.0 -#--- choose composite-Implementation: -#geometryFunctionPath = /home/stefan/DUNE/dune-microstructure/geometries -geometryFunctionPath = /home/klaus/Desktop/Dune-Testing/dune-microstructure/geometries - - - ############################################# # Assembly options @@ -93,4 +87,4 @@ write_checkOrthogonality = true #write_corrector_phi3 = true # --- write effective quantities to Matlab-folder for symbolic minimization: -write_toMATLAB = false +write_toMATLAB = true # writes effective quantities to .txt-files QMatrix.txt and BMatrix.txt diff --git a/install-commands.sh b/install-commands.sh new file mode 100644 index 0000000000000000000000000000000000000000..4838b4a5e13c5d6604c63ce438b002a0a33aeb15 --- /dev/null +++ b/install-commands.sh @@ -0,0 +1,24 @@ +#!/bin/sh + + + + +git clone https://gitlab.dune-project.org/core/dune-common +git clone https://gitlab.dune-project.org/core/dune-geometry +git clone https://gitlab.dune-project.org/core/dune-grid +git clone https://gitlab.dune-project.org/core/dune-istl +git clone https://gitlab.dune-project.org/core/dune-localfunctions.git +git clone https://gitlab.dune-project.org/staging/dune-functions +git clone https://gitlab.dune-project.org/staging/dune-uggrid +git clone https://gitlab.dune-project.org/staging/dune-typetree +git clone git@gitlab.mn.tu-dresden.de:s7603593/dune-microstructure.git + +git clone https://git.imp.fu-berlin.de/agnumpde/dune-matrix-vector.git +git clone https://git.imp.fu-berlin.de/agnumpde/dune-fufem.git +git clone https://git.imp.fu-berlin.de/agnumpde/dune-solvers.git + + + +dunecontrol all + +./dune-microstructure/build-cmake/src/Cell-Problem ./dune-microstructure/inputs/cellsolver.parset diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 42b95a4c3836f9c74ea51de3686a23ccbfc99df5..f3f3b05f03424e97cdfdaca5742385a080db0069 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -3,8 +3,7 @@ #set(CMAKE_BUILD_TYPE Debug)# -set(programs Cell-Problem - Cell-Problem-New) +set(programs Cell-Problem) foreach(_program ${programs})