From e605cc1ddc34787f83e00a37c92b2daaf639ea68 Mon Sep 17 00:00:00 2001
From: Stefan Neukamm <stefan.neukamm@tu-dresden.de>
Date: Mon, 11 Jul 2022 12:53:27 +0200
Subject: [PATCH] update
---
geometries/material_neukamm.py | 37 +++++++++++++------
inputs/cellsolver.parset | 13 ++++---
microstructure_testsuite/plot.py | 10 +++--
outputs/Results/2x2/1/BMatrix.txt | 3 --
outputs/Results/2x2/1/QMatrix.txt | 9 -----
outputs/Results/2x2/1/output.txt | 61 -------------------------------
outputs/Results/2x2/1/parameter | 14 -------
outputs/Results/2x2/2/BMatrix.txt | 3 --
outputs/Results/2x2/2/QMatrix.txt | 9 -----
outputs/Results/2x2/2/output.txt | 61 -------------------------------
outputs/Results/2x2/2/parameter | 15 --------
outputs/Results/2x2/3/BMatrix.txt | 3 --
outputs/Results/2x2/3/QMatrix.txt | 9 -----
outputs/Results/2x2/3/output.txt | 61 -------------------------------
outputs/Results/2x2/3/parameter | 19 ----------
outputs/Results/2x2/4/BMatrix.txt | 3 --
outputs/Results/2x2/4/QMatrix.txt | 9 -----
outputs/Results/2x2/4/output.txt | 40 --------------------
outputs/Results/2x2/4/parameter | 19 ----------
outputs/Results/4x4/1/BMatrix.txt | 3 --
outputs/Results/4x4/1/QMatrix.txt | 9 -----
outputs/Results/4x4/1/parameter | 15 --------
outputs/Results/4x4/2/BMatrix.txt | 3 --
outputs/Results/4x4/2/QMatrix.txt | 9 -----
outputs/Results/4x4/2/parameter | 15 --------
25 files changed, 39 insertions(+), 413 deletions(-)
delete mode 100644 outputs/Results/2x2/1/BMatrix.txt
delete mode 100644 outputs/Results/2x2/1/QMatrix.txt
delete mode 100644 outputs/Results/2x2/1/output.txt
delete mode 100644 outputs/Results/2x2/1/parameter
delete mode 100644 outputs/Results/2x2/2/BMatrix.txt
delete mode 100644 outputs/Results/2x2/2/QMatrix.txt
delete mode 100644 outputs/Results/2x2/2/output.txt
delete mode 100644 outputs/Results/2x2/2/parameter
delete mode 100644 outputs/Results/2x2/3/BMatrix.txt
delete mode 100644 outputs/Results/2x2/3/QMatrix.txt
delete mode 100644 outputs/Results/2x2/3/output.txt
delete mode 100644 outputs/Results/2x2/3/parameter
delete mode 100644 outputs/Results/2x2/4/BMatrix.txt
delete mode 100644 outputs/Results/2x2/4/QMatrix.txt
delete mode 100644 outputs/Results/2x2/4/output.txt
delete mode 100644 outputs/Results/2x2/4/parameter
delete mode 100644 outputs/Results/4x4/1/BMatrix.txt
delete mode 100644 outputs/Results/4x4/1/QMatrix.txt
delete mode 100644 outputs/Results/4x4/1/parameter
delete mode 100644 outputs/Results/4x4/2/BMatrix.txt
delete mode 100644 outputs/Results/4x4/2/QMatrix.txt
delete mode 100644 outputs/Results/4x4/2/parameter
diff --git a/geometries/material_neukamm.py b/geometries/material_neukamm.py
index d6d38a76..42440c6d 100644
--- a/geometries/material_neukamm.py
+++ b/geometries/material_neukamm.py
@@ -5,25 +5,40 @@ import math
# x[0] : y1-component
# x[1] : y2-component
# x[2] : x3-component
+# --- replace with your definition of indicatorFunction:
+###############
+# Wood
+###############
+# def f(x):
+# theta=0.25
+ # if ((abs(x[0]) < theta/2) and x[2]<0.25):
+ # return 1 #latewood
+ # elif ((abs(x[0]) > theta/2) and x[2]<0.25):
+ # return 2 #earlywood
+ # else :
+ # return 0 #Phase3
+
+# def b1(x):
+# return [[.5, 0, 0], [0,1,0], [0,0,0]]
+
+# def b2(x):
+# return [[.4, 0, 0], [0,.4,0], [0,0,0]]
+
+# def b3(x):
+# return [[0, 0, 0], [0,0,0], [0,0,0]]
+###############
+# Cross
+###############
def f(x):
theta=0.25
factor=1
- # --- replace with your definition of indicatorFunction:
- #
- # if ((abs(x[0]) < theta/2) and x[2]<0):
- # return 1 #Phase1
- # else :
- # return 0 #Phase3
-
- #
- if ((abs(x[0]) < theta/2) and x[2]<-1/2+theta):
+ if (x[0] <-1/2+theta and x[2]<-1/2+theta):
return 1 #Phase1
- elif ((abs(x[1]) < factor*theta/2) and x[2]>1/2-factor*theta):
+ elif (x[1]< -1/2+theta and x[2]>1/2-theta):
return 2 #Phase2
else :
return 0 #Phase3
-
def b1(x):
return [[1, 0, 0], [0,1,0], [0,0,1]]
diff --git a/inputs/cellsolver.parset b/inputs/cellsolver.parset
index 5ac539f1..f2bb27d6 100644
--- a/inputs/cellsolver.parset
+++ b/inputs/cellsolver.parset
@@ -27,7 +27,7 @@ cellDomain=1
## {start,finish} computes on all grid from 2^(start) to 2^finish refinement
#----------------------------------------------------
-numLevels=2 4
+numLevels=2 5
#numLevels = 1 1 # computes all levels from first to second entry
#numLevels = 2 2 # computes all levels from first to second entry
#numLevels = 1 3 # computes all levels from first to second entry
@@ -64,13 +64,14 @@ lambda1=1.0
# better: pass material parameters as a vector
-mu=80 80 60
-lambda=80 80 25
+# Poisson ratio nu = 1/4 => lambda = 0.4*mu
+mu=1.2 1.2 1
+lambda=0.48 0.48 0.4
#rho=1.0 0
# ---volume fraction (default value = 1.0/4.0)
-theta=0.25
+theta=0.5
#theta = 0.3
#theta = 0.75
#theta = 0.125
@@ -96,8 +97,8 @@ material_prestrain_imp= "material_neukamm" #(Python-indicator-function with sa
# --- (Optional output) write Material / prestrain / Corrector functions to .vtk-Files (default=false):
-#write_materialFunctions = true
-#write_prestrainFunctions = true # VTK norm of B ,
+write_materialFunctions = true
+write_prestrainFunctions = true # VTK norm of B ,
#write_VTK = true
diff --git a/microstructure_testsuite/plot.py b/microstructure_testsuite/plot.py
index 00bea1be..22f57171 100644
--- a/microstructure_testsuite/plot.py
+++ b/microstructure_testsuite/plot.py
@@ -48,15 +48,17 @@ elif case == 4: # Section 6.1
Q=np.array([[q1,q12/2,0],[q12/2,q2,0],[0,0,q3]])
B=np.array([[rho*3/2*(1-theta)],[rho*3/2*(1-theta)/(1+theta)],[0]])
elif case==-1: # Read from outputs
- QFilePath = os.path.dirname(os.getcwd()) + '/outputs/QMatrix.txt'
- BFilePath = os.path.dirname(os.getcwd())+ '/outputs/BMatrix.txt'
+ DataPath = os.path.dirname(os.getcwd())+'/outputs'
+ #DataPath='/home/stefan/DUNE/dune-microstructure/outputs/Results/4x4/1'
+ QFilePath = DataPath + '/QMatrix.txt'
+ BFilePath = DataPath + '/BMatrix.txt'
Q, B = ReadEffectiveQuantities(QFilePath,BFilePath)
Q=0.5*(np.transpose(Q)+Q) # symmetrize
B=np.transpose([B])
#
#
-length=80
+length=0.4
N=200
h=length/N
E=np.zeros([N,N])
@@ -75,7 +77,7 @@ ax.set_aspect(1)
ax.set_xticks([-length/4,0,length/4])
ax.set_yticks([])
#pcm = plt.pcolor(X,Y,E, norm=colors.LogNorm(vmin=E.min(), vmax=E.max()), cmap='winter', shading='auto')
-pcm = plt.pcolor(X,Y,E, norm=colors.PowerNorm(gamma=0.25), cmap='brg')
+pcm = plt.pcolor(X,Y,E, norm=colors.PowerNorm(gamma=0.2), cmap='brg')
plt.colorbar(pcm, extend='max')
#plt.imshow(np.log(E-np.min(E)+0.0001)) # normalize to min = 0 and log scale to emphasize energy landscape
# TODO: Beschriftung der Axen sollte von [-h*N/2, h*N/2] sein!
diff --git a/outputs/Results/2x2/1/BMatrix.txt b/outputs/Results/2x2/1/BMatrix.txt
deleted file mode 100644
index 0fb3c029..00000000
--- a/outputs/Results/2x2/1/BMatrix.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-1 1 -0.0144287202371896055
-1 2 0.014428690223795131
-1 3 -2.0320334857961725e-11
diff --git a/outputs/Results/2x2/1/QMatrix.txt b/outputs/Results/2x2/1/QMatrix.txt
deleted file mode 100644
index 9d8813d5..00000000
--- a/outputs/Results/2x2/1/QMatrix.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-1 1 12.4813265250416485
-1 2 2.0831795458888962
-1 3 3.83811740666402797e-10
-2 1 2.0831795513179836
-2 2 12.481326525238547
-2 3 1.78942192122814843e-10
-3 1 -6.40561063029264521e-10
-3 2 -1.00945173229121783e-09
-3 3 10.3922965257922275
diff --git a/outputs/Results/2x2/1/output.txt b/outputs/Results/2x2/1/output.txt
deleted file mode 100644
index 215cb327..00000000
--- a/outputs/Results/2x2/1/output.txt
+++ /dev/null
@@ -1,61 +0,0 @@
-material_prestrain used: material_neukamm
------ Input Parameters -----:
-alpha: 8
-gamma: 1
-theta: 0.25
-beta: 3
-material parameters:
-mu1: 1
-mu2: 3
-lambda1: 1
-lambda2: 3
-----------------------------:
-Number of Elements in each direction: [4,4,4]
-size of FiniteElementBasis: 240
-Solver-type used: CG-Solver
----------- OUTPUT ----------
- --------------------
-Corrector-Matrix M_1:
--0.00922212 -2.49142e-10 0
--2.49142e-10 -0.00494017 0
-0 0 0
-
- --------------------
-Corrector-Matrix M_2:
-0.00494016 -2.03726e-10 0
--2.03726e-10 0.00922211 0
-0 0 0
-
- --------------------
-Corrector-Matrix M_3:
-1.90697e-10 -4.74653e-11 0
--4.74653e-11 1.93256e-10 0
-0 0 0
-
- --------------------
-Effective Matrix Q:
-12.4813 2.08318 3.83812e-10
-2.08318 12.4813 1.78942e-10
--6.40561e-10 -1.00945e-09 10.3923
-
---- Prestrain Output ---
-B_hat: -0.150032 0.150032 -2.16498e-10
-B_eff: -0.0144287 0.0144287 -2.03203e-11 (Effective Prestrain)
-------------------------
-q1=12.4813
-q2=12.4813
-q3=10.3923
-q12=2.08318
-b1=-0.0144287
-b2=0.0144287
-b3=-2.03203e-11
-b1_hat: -0.150032
-b2_hat: 0.150032
-b3_hat: -2.16498e-10
-mu_gamma=10.3923
-q_onetwo=2.083180
----------------------------------------------------------------------------------------------------------
- Levels | q1 | q2 | q3 | b1 | b2 | b3 |
----------------------------------------------------------------------------------------------------------
- 2 & 1.24813e+01 & 1.24813e+01 & 1.03923e+01 & -1.44287e-02 & 1.44287e-02 & -2.03203e-11 &
----------------------------------------------------------------------------------------------------------
diff --git a/outputs/Results/2x2/1/parameter b/outputs/Results/2x2/1/parameter
deleted file mode 100644
index f19d4939..00000000
--- a/outputs/Results/2x2/1/parameter
+++ /dev/null
@@ -1,14 +0,0 @@
-mu=80 60
-lambda=80 25
-rho=1.0 0
-
-def f(x):
- theta=0.25
- # --- replace with your definition of indicatorFunction:
- if ((abs(x[0]) < theta/2) and x[2]<-1/2+theta):
- return 1 #Phase1
- elif ((abs(x[1]) < theta/2) and x[2]>1/2-theta):
- return 1 #Phase1
- else :
- return 0 #Phase2
-
diff --git a/outputs/Results/2x2/2/BMatrix.txt b/outputs/Results/2x2/2/BMatrix.txt
deleted file mode 100644
index 0fb3c029..00000000
--- a/outputs/Results/2x2/2/BMatrix.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-1 1 -0.0144287202371896055
-1 2 0.014428690223795131
-1 3 -2.0320334857961725e-11
diff --git a/outputs/Results/2x2/2/QMatrix.txt b/outputs/Results/2x2/2/QMatrix.txt
deleted file mode 100644
index 9d8813d5..00000000
--- a/outputs/Results/2x2/2/QMatrix.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-1 1 12.4813265250416485
-1 2 2.0831795458888962
-1 3 3.83811740666402797e-10
-2 1 2.0831795513179836
-2 2 12.481326525238547
-2 3 1.78942192122814843e-10
-3 1 -6.40561063029264521e-10
-3 2 -1.00945173229121783e-09
-3 3 10.3922965257922275
diff --git a/outputs/Results/2x2/2/output.txt b/outputs/Results/2x2/2/output.txt
deleted file mode 100644
index 215cb327..00000000
--- a/outputs/Results/2x2/2/output.txt
+++ /dev/null
@@ -1,61 +0,0 @@
-material_prestrain used: material_neukamm
------ Input Parameters -----:
-alpha: 8
-gamma: 1
-theta: 0.25
-beta: 3
-material parameters:
-mu1: 1
-mu2: 3
-lambda1: 1
-lambda2: 3
-----------------------------:
-Number of Elements in each direction: [4,4,4]
-size of FiniteElementBasis: 240
-Solver-type used: CG-Solver
----------- OUTPUT ----------
- --------------------
-Corrector-Matrix M_1:
--0.00922212 -2.49142e-10 0
--2.49142e-10 -0.00494017 0
-0 0 0
-
- --------------------
-Corrector-Matrix M_2:
-0.00494016 -2.03726e-10 0
--2.03726e-10 0.00922211 0
-0 0 0
-
- --------------------
-Corrector-Matrix M_3:
-1.90697e-10 -4.74653e-11 0
--4.74653e-11 1.93256e-10 0
-0 0 0
-
- --------------------
-Effective Matrix Q:
-12.4813 2.08318 3.83812e-10
-2.08318 12.4813 1.78942e-10
--6.40561e-10 -1.00945e-09 10.3923
-
---- Prestrain Output ---
-B_hat: -0.150032 0.150032 -2.16498e-10
-B_eff: -0.0144287 0.0144287 -2.03203e-11 (Effective Prestrain)
-------------------------
-q1=12.4813
-q2=12.4813
-q3=10.3923
-q12=2.08318
-b1=-0.0144287
-b2=0.0144287
-b3=-2.03203e-11
-b1_hat: -0.150032
-b2_hat: 0.150032
-b3_hat: -2.16498e-10
-mu_gamma=10.3923
-q_onetwo=2.083180
----------------------------------------------------------------------------------------------------------
- Levels | q1 | q2 | q3 | b1 | b2 | b3 |
----------------------------------------------------------------------------------------------------------
- 2 & 1.24813e+01 & 1.24813e+01 & 1.03923e+01 & -1.44287e-02 & 1.44287e-02 & -2.03203e-11 &
----------------------------------------------------------------------------------------------------------
diff --git a/outputs/Results/2x2/2/parameter b/outputs/Results/2x2/2/parameter
deleted file mode 100644
index 10f37df1..00000000
--- a/outputs/Results/2x2/2/parameter
+++ /dev/null
@@ -1,15 +0,0 @@
-mu=80 60
-lambda=80 25
-rho=1.0 0
-
-def f(x):
- theta=0.25
- factor=0.8
- # --- replace with your definition of indicatorFunction:
- if ((abs(x[0]) < theta/2) and x[2]<-1/2+theta):
- return 1 #Phase1
- elif ((abs(x[1]) < factor*theta/2) and x[2]>1/2-theta):
- return 1 #Phase1
- else :
- return 0 #Phase2
-
diff --git a/outputs/Results/2x2/3/BMatrix.txt b/outputs/Results/2x2/3/BMatrix.txt
deleted file mode 100644
index 0fb3c029..00000000
--- a/outputs/Results/2x2/3/BMatrix.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-1 1 -0.0144287202371896055
-1 2 0.014428690223795131
-1 3 -2.0320334857961725e-11
diff --git a/outputs/Results/2x2/3/QMatrix.txt b/outputs/Results/2x2/3/QMatrix.txt
deleted file mode 100644
index 9d8813d5..00000000
--- a/outputs/Results/2x2/3/QMatrix.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-1 1 12.4813265250416485
-1 2 2.0831795458888962
-1 3 3.83811740666402797e-10
-2 1 2.0831795513179836
-2 2 12.481326525238547
-2 3 1.78942192122814843e-10
-3 1 -6.40561063029264521e-10
-3 2 -1.00945173229121783e-09
-3 3 10.3922965257922275
diff --git a/outputs/Results/2x2/3/output.txt b/outputs/Results/2x2/3/output.txt
deleted file mode 100644
index 215cb327..00000000
--- a/outputs/Results/2x2/3/output.txt
+++ /dev/null
@@ -1,61 +0,0 @@
-material_prestrain used: material_neukamm
------ Input Parameters -----:
-alpha: 8
-gamma: 1
-theta: 0.25
-beta: 3
-material parameters:
-mu1: 1
-mu2: 3
-lambda1: 1
-lambda2: 3
-----------------------------:
-Number of Elements in each direction: [4,4,4]
-size of FiniteElementBasis: 240
-Solver-type used: CG-Solver
----------- OUTPUT ----------
- --------------------
-Corrector-Matrix M_1:
--0.00922212 -2.49142e-10 0
--2.49142e-10 -0.00494017 0
-0 0 0
-
- --------------------
-Corrector-Matrix M_2:
-0.00494016 -2.03726e-10 0
--2.03726e-10 0.00922211 0
-0 0 0
-
- --------------------
-Corrector-Matrix M_3:
-1.90697e-10 -4.74653e-11 0
--4.74653e-11 1.93256e-10 0
-0 0 0
-
- --------------------
-Effective Matrix Q:
-12.4813 2.08318 3.83812e-10
-2.08318 12.4813 1.78942e-10
--6.40561e-10 -1.00945e-09 10.3923
-
---- Prestrain Output ---
-B_hat: -0.150032 0.150032 -2.16498e-10
-B_eff: -0.0144287 0.0144287 -2.03203e-11 (Effective Prestrain)
-------------------------
-q1=12.4813
-q2=12.4813
-q3=10.3923
-q12=2.08318
-b1=-0.0144287
-b2=0.0144287
-b3=-2.03203e-11
-b1_hat: -0.150032
-b2_hat: 0.150032
-b3_hat: -2.16498e-10
-mu_gamma=10.3923
-q_onetwo=2.083180
----------------------------------------------------------------------------------------------------------
- Levels | q1 | q2 | q3 | b1 | b2 | b3 |
----------------------------------------------------------------------------------------------------------
- 2 & 1.24813e+01 & 1.24813e+01 & 1.03923e+01 & -1.44287e-02 & 1.44287e-02 & -2.03203e-11 &
----------------------------------------------------------------------------------------------------------
diff --git a/outputs/Results/2x2/3/parameter b/outputs/Results/2x2/3/parameter
deleted file mode 100644
index 8fbb9f5a..00000000
--- a/outputs/Results/2x2/3/parameter
+++ /dev/null
@@ -1,19 +0,0 @@
-mu=80 60
-lambda=80 25
-rho=1.0 0
-
-#Indicator function that determines both phases
-# x[0] : y1-component
-# x[1] : y2-component
-# x[2] : x3-component
-def f(x):
- theta=0.5
- factor=1
- # --- replace with your definition of indicatorFunction:
- if ((abs(x[0]) < theta/2) and x[2]<-1/2+theta):
- return 1 #Phase1
- elif ((abs(x[1]) < factor*theta/2) and x[2]>1/2-factor*theta):
- return 1 #Phase1
- else :
- return 0 #Phase2
-
diff --git a/outputs/Results/2x2/4/BMatrix.txt b/outputs/Results/2x2/4/BMatrix.txt
deleted file mode 100644
index be6a7591..00000000
--- a/outputs/Results/2x2/4/BMatrix.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-1 1 -2.74206114740746898
-1 2 -3.10270304357049476
-1 3 3.0398257121603124e-09
diff --git a/outputs/Results/2x2/4/QMatrix.txt b/outputs/Results/2x2/4/QMatrix.txt
deleted file mode 100644
index 245d4d77..00000000
--- a/outputs/Results/2x2/4/QMatrix.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-1 1 14.4975598095779166
-1 2 3.98327256772200711
-1 3 -6.56940620062560124e-09
-2 1 3.98327260564529295
-2 2 14.8275228823281235
-2 3 -6.51275988527633122e-09
-3 1 -2.09762192341099332e-09
-3 2 -1.83361834006557389e-09
-3 3 10.6556275724235974
diff --git a/outputs/Results/2x2/4/output.txt b/outputs/Results/2x2/4/output.txt
deleted file mode 100644
index d7694ae7..00000000
--- a/outputs/Results/2x2/4/output.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-material_prestrain used: material_neukamm
------ Input Parameters -----:
-alpha: 8
-gamma: 1
-theta: 0.25
-beta: 3
-material parameters:
-mu1: 1
-mu2: 3
-lambda1: 1
-lambda2: 3
-----------------------------:
-Number of Elements in each direction: [4,4,4]
-size of FiniteElementBasis: 240
-Solver-type used: CG-Solver
----------- OUTPUT ----------
- --------------------
-Corrector-Matrix M_1:
--0.277147 1.10701e-09 0
-1.10701e-09 -0.334813 0
-0 0 0
-
- --------------------
-Corrector-Matrix M_2:
--0.478197 8.17764e-10 0
-8.17764e-10 -0.188937 0
-0 0 0
-
- --------------------
-Corrector-Matrix M_3:
-2.06316e-11 0.115943 0
-0.115943 3.27431e-10 0
-0 0 0
-
- --------------------
-Effective Matrix Q:
-14.4976 3.98327 -6.56941e-09
-3.98327 14.8275 -6.51276e-09
--2.09762e-09 -1.83362e-09 10.6556
-
diff --git a/outputs/Results/2x2/4/parameter b/outputs/Results/2x2/4/parameter
deleted file mode 100644
index cbe045d5..00000000
--- a/outputs/Results/2x2/4/parameter
+++ /dev/null
@@ -1,19 +0,0 @@
-mu=80 60
-lambda=80 25
-rho=1.0 0
-
-#Indicator function that determines both phases
-# x[0] : y1-component
-# x[1] : y2-component
-# x[2] : x3-component
-def f(x):
- theta=0.5
- factor=0.5
- # --- replace with your definition of indicatorFunction:
- if ((abs(x[0]) < theta/2) and x[2]<-1/2+theta):
- return 1 #Phase1
- elif ((abs(x[1]) < factor*theta/2) and x[2]>1/2-factor*theta):
- return 1 #Phase1
- else :
- return 0 #Phase2
-
diff --git a/outputs/Results/4x4/1/BMatrix.txt b/outputs/Results/4x4/1/BMatrix.txt
deleted file mode 100644
index f9f6228b..00000000
--- a/outputs/Results/4x4/1/BMatrix.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-1 1 0.660848323245719738
-1 2 -0.66084827993852846
-1 3 -6.068513378040036e-10
diff --git a/outputs/Results/4x4/1/QMatrix.txt b/outputs/Results/4x4/1/QMatrix.txt
deleted file mode 100644
index dc3f2b32..00000000
--- a/outputs/Results/4x4/1/QMatrix.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-1 1 14.3859585372529803
-1 2 2.77236599298506281
-1 3 -2.42147260956249048e-10
-2 1 2.77236599345047274
-2 2 14.3859585326148895
-2 3 2.60356423062366068e-08
-3 1 7.61360853362081604e-10
-3 2 5.6448884340256504e-10
-3 3 11.4617831133878436
diff --git a/outputs/Results/4x4/1/parameter b/outputs/Results/4x4/1/parameter
deleted file mode 100644
index dc094c07..00000000
--- a/outputs/Results/4x4/1/parameter
+++ /dev/null
@@ -1,15 +0,0 @@
-mu=80 60
-lambda=80 25
-rho=1.0 0
-
-def f(x):
- theta=0.5
- factor=1
- # --- replace with your definition of indicatorFunction:
- if ((abs(x[0]) < theta/2) and x[2]<-1/2+theta):
- return 1 #Phase1
- elif ((abs(x[1]) < factor*theta/2) and x[2]>1/2-factor*theta):
- return 1 #Phase1
- else :
- return 0 #Phase2
-
diff --git a/outputs/Results/4x4/2/BMatrix.txt b/outputs/Results/4x4/2/BMatrix.txt
deleted file mode 100644
index 70af8f44..00000000
--- a/outputs/Results/4x4/2/BMatrix.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-1 1 0.44108759919650381
-1 2 -0.849701612828117514
-1 3 1.21280778469193972e-10
diff --git a/outputs/Results/4x4/2/QMatrix.txt b/outputs/Results/4x4/2/QMatrix.txt
deleted file mode 100644
index a7de0e2d..00000000
--- a/outputs/Results/4x4/2/QMatrix.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-1 1 14.2867186772455206
-1 2 2.75022913560156557
-1 3 -9.16110146344798329e-08
-2 1 2.75022913428882676
-2 2 14.3273497791238853
-2 3 -2.0330618105908734e-08
-3 1 8.45189208141952012e-10
-3 2 7.32785036249211903e-10
-3 3 11.4128457014374884
diff --git a/outputs/Results/4x4/2/parameter b/outputs/Results/4x4/2/parameter
deleted file mode 100644
index 0f7d8246..00000000
--- a/outputs/Results/4x4/2/parameter
+++ /dev/null
@@ -1,15 +0,0 @@
-mu=80 60
-lambda=80 25
-rho=1.0 0
-
-def f(x):
- theta=0.5
- factor=.9
- # --- replace with your definition of indicatorFunction:
- if ((abs(x[0]) < theta/2) and x[2]<-1/2+theta):
- return 1 #Phase1
- elif ((abs(x[1]) < factor*theta/2) and x[2]>1/2-factor*theta):
- return 1 #Phase1
- else :
- return 0 #Phase2
-
--
GitLab