From 153955bcde2bd2dd943aa54a5e46b463b097577e Mon Sep 17 00:00:00 2001
From: Klaus <klaus.boehnlein@tu-dresden.de>
Date: Mon, 10 Mar 2025 10:26:48 +0100
Subject: [PATCH] fix some typos in experiments

---
 experiment/macro-problem/MVM_infinitynorm.py | 11 +++++++----
 experiment/macro-problem/MVM_onenorm.py      |  7 +++++--
 experiment/macro-problem/fibreRotation.py    |  2 +-
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/experiment/macro-problem/MVM_infinitynorm.py b/experiment/macro-problem/MVM_infinitynorm.py
index 67b89e0f..c76b48a7 100644
--- a/experiment/macro-problem/MVM_infinitynorm.py
+++ b/experiment/macro-problem/MVM_infinitynorm.py
@@ -50,12 +50,15 @@ parameterSet.conforming_DiscreteJacobian = 0
 # Tolerance of the multigrid solver
 parameterSet.tolerance = 1e-12
 # Maximum number of multigrid iterations
-parameterSet.maxProximalNewtonSteps = 200
+parameterSet.maxProximalNewtonSteps = 1000
 # Initial regularization
-parameterSet.initialRegularization = 200
+parameterSet.initialRegularization = 1000
 # Measure convergence
 parameterSet.instrumented = 0
 
+# parameterSet.regularizationNorm = 'Euclidean'
+parameterSet.regularizationNorm = 'H1semi'
+
 ############################
 #   Problem specifications
 ############################
@@ -124,8 +127,8 @@ class GlobalMicrostructure:
         self.macroPhases = 1
 
         # define first local microstructure options.
-        self.macroPhase1_constantMicrostructure = True
-        # self.macroPhase1_constantMicrostructure = False 
+        # self.macroPhase1_constantMicrostructure = True
+        self.macroPhase1_constantMicrostructure = False 
         self.macroPhase1_readEffectiveQuantities = False;
 
 
diff --git a/experiment/macro-problem/MVM_onenorm.py b/experiment/macro-problem/MVM_onenorm.py
index 9e764617..3cfbe7b7 100644
--- a/experiment/macro-problem/MVM_onenorm.py
+++ b/experiment/macro-problem/MVM_onenorm.py
@@ -56,6 +56,9 @@ parameterSet.initialRegularization = 200
 # Measure convergence
 parameterSet.instrumented = 0
 
+# parameterSet.regularizationNorm = 'Euclidean'
+parameterSet.regularizationNorm = 'H1semi'
+
 ############################
 #   Problem specifications
 ############################
@@ -281,7 +284,7 @@ parameterSet.printMicroOutput = 1 # Flag that allows to supress the output of th
 #############################################
 #  Grid parameters
 #############################################
-parameterSet.microGridLevel = 1
+parameterSet.microGridLevel = 3
 
 
 #############################################
@@ -304,7 +307,7 @@ parameterSet.Solver_verbosity = 0  # (default = 2)  degree of information for so
 #  Write/Output options      #(default=false)
 #############################################
 # --- (Optional output) write Material / prestrain / Corrector functions to .vtk-Files:
-parameterSet.write_materialFunctions = 1   # VTK indicator function for material/prestrain definition
+parameterSet.write_materialFunctions = 0   # VTK indicator function for material/prestrain definition
 #parameterSet.write_prestrainFunctions = 1  # VTK norm of B (currently not implemented)
 parameterSet.MaterialSubsamplingRefinement= 2
 # --- Write Correctos to VTK-File:  
diff --git a/experiment/macro-problem/fibreRotation.py b/experiment/macro-problem/fibreRotation.py
index d2d86d6f..60f06e00 100644
--- a/experiment/macro-problem/fibreRotation.py
+++ b/experiment/macro-problem/fibreRotation.py
@@ -225,7 +225,7 @@ class GlobalMicrostructure:
                 x = np.array(y)
 
                 #Rotated Fibre of width theta
-                if (abs(-np.cos(self.alpha)*x[0] + np.sin(self.alpha)*x[1] ) < self.theta and x[2] >= 0 ):
+                if (abs(-np.cos(alpha)*x[0] + np.sin(alpha)*x[1] ) < theta and x[2] >= 0 ):
                     return 1    #Phase1   
                 else :
                     return 2    #Phase2
-- 
GitLab