Skip to content
Snippets Groups Projects
Commit 28fd10d7 authored by Klaus Böhnlein's avatar Klaus Böhnlein
Browse files

Update

parent 93685fc9
Branches
No related tags found
No related merge requests found
...@@ -177,7 +177,7 @@ public: ...@@ -177,7 +177,7 @@ public:
if (b==0) if (b==0)
{ {
auto prestrainPhaseValue = prestrain_(localIndicatorFunction(quadPos)); 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; // elementPrestrain += linearizedStVenantKirchhoffDensity(mu(quadPos), lambda(quadPos), X1, prestrainFunctional(quadPos)) * quadPoint.weight() * integrationElement;
} }
} }
...@@ -226,7 +226,7 @@ public: ...@@ -226,7 +226,7 @@ public:
// --- write Data to Matlab / Optimization-Code // --- write Data to Matlab / Optimization-Code
void writeToMatlab(std::string outputPath) 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(Q, "../../Matlab-Programs/QMatrix.txt");
writeMatrixToMatlab(Qeff_, outputPath + "/QMatrix.txt"); writeMatrixToMatlab(Qeff_, outputPath + "/QMatrix.txt");
// write effective Prestrain in Matrix for Output // write effective Prestrain in Matrix for Output
......
...@@ -13,7 +13,7 @@ outputPath=/home/klaus/Desktop/Dune-Testing/dune-microstructure/outputs ...@@ -13,7 +13,7 @@ outputPath=/home/klaus/Desktop/Dune-Testing/dune-microstructure/outputs
# --- DEBUG (Output) Option: # --- DEBUG (Output) Option:
print_debug = true #(default=false) #print_debug = true #(default=false)
############################################# #############################################
...@@ -24,7 +24,7 @@ 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 ## {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 ...@@ -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 # Assembly options
...@@ -93,4 +87,4 @@ write_checkOrthogonality = true ...@@ -93,4 +87,4 @@ write_checkOrthogonality = true
#write_corrector_phi3 = true #write_corrector_phi3 = true
# --- write effective quantities to Matlab-folder for symbolic minimization: # --- 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
#!/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
...@@ -3,8 +3,7 @@ ...@@ -3,8 +3,7 @@
#set(CMAKE_BUILD_TYPE Debug)# #set(CMAKE_BUILD_TYPE Debug)#
set(programs Cell-Problem set(programs Cell-Problem)
Cell-Problem-New)
foreach(_program ${programs}) foreach(_program ${programs})
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment