From f8b91769b4bc9c37a9b555a28329dd1087843ee1 Mon Sep 17 00:00:00 2001
From: ErinKuci <Erin.Kuci@ulg.ac.be>
Date: Mon, 10 Sep 2018 09:58:37 +0200
Subject: [PATCH] some simplifications
---
Lbracket/topo.geo | 4 ++--
Lbracket/topo.pro | 2 +-
Lbracket/topo.py | 15 ---------------
Team25/shape.py | 2 --
4 files changed, 3 insertions(+), 20 deletions(-)
diff --git a/Lbracket/topo.geo b/Lbracket/topo.geo
index 959aca0..3223466 100644
--- a/Lbracket/topo.geo
+++ b/Lbracket/topo.geo
@@ -1,5 +1,5 @@
-lc=0.004;
mm=1e-3;
+lc=8*mm;
Point(1) = {0, 0, 0, lc};
Point(2) = {600*mm, 0, 0, lc};
@@ -35,5 +35,5 @@ Physical Line(1003) = {4};
Physical Point(1002) = {3};
Solver.AutoMesh = 0;
-Mesh.Algorithm = 1;
+//Mesh.Algorithm = 1;
diff --git a/Lbracket/topo.pro b/Lbracket/topo.pro
index 817b987..0b67298 100644
--- a/Lbracket/topo.pro
+++ b/Lbracket/topo.pro
@@ -4,7 +4,7 @@ DefineConstant [
Opt_ResDir = "res_opt/"
Opt_ResDir_Onelab = "Optimization/Results/"
densityFieldInit = {0.5, Name "Optimization/3Density/0Inital value"}
- Opt_filter_radius = {0.004, Name "Optimization/3Density/2filter radius"}
+ Opt_filter_radius = {0.009, Name "Optimization/3Density/2filter radius"}
Flag_PrintLevel = {1, Name "General/Verbosity", Visible 1}
Flag_opt_matlaw = {OPT::YOUNG_LAW.modifiedSimp,
Choices {
diff --git a/Lbracket/topo.py b/Lbracket/topo.py
index dc41a71..1456f32 100644
--- a/Lbracket/topo.py
+++ b/Lbracket/topo.py
@@ -44,11 +44,6 @@ c.runSubClient('myGetDP', mygetdp)
maxIter = c.defineNumber('Optimization/00Max iterations', value=1600)
maxChange = c.defineNumber('Optimization/01Max change', value=1e-2)
filtering = c.defineNumber('Optimization/02Filtering/00Filter densities', value=1, choices=[0,1])
-filterContinuation = c.defineNumber('Optimization/02Filtering/01continuation?', value=0, choices=[0,1])
-nbLoopReduceFilterRadius = c.defineNumber('Optimization/02Filtering/02frequency of radius update', value=40)
-filterRadiusDecrease = c.defineNumber('Optimization/02Filtering/03reduce factor', value=0.7)
-filterRadiusMin = c.defineNumber('Optimization/02Filtering/04radius min', value=0.0015)
-filterRadius = c.getNumber('Optimization/3Density/2filter radius')
# end of check phase. We're done if we do not start the optimization
if c.action == 'check' :
@@ -193,15 +188,5 @@ while change > maxChange and it <= maxIter and c.getString('topo/Action') != 'st
change = optlab.mma.getDesignChange()
it = optlab.mma.getOuterIteration()
- if filtering and filterContinuation and \
- (it % nbLoopReduceFilterRadius == 0.0 or change <= maxChange):
- filterRadius *= filterRadiusDecrease
- print "decrease filter radius: ", filterRadius
- c.setNumber('Optimization/3Density/2filter radius',value=filterRadius)
- filtering = filterRadius <= filterRadiusMin
- print "filtering: ",filtering
- c.setNumber('Optimization/02Filtering/00Filter densities',value=filtering)
- change = 1.0
-
# This should be called at the end
optlab.mma.finalize()
diff --git a/Team25/shape.py b/Team25/shape.py
index 6a01cc9..0bb2d1e 100644
--- a/Team25/shape.py
+++ b/Team25/shape.py
@@ -168,8 +168,6 @@ while it <= maxIter and c.getString('shape/Action') != 'stop':
print 'objective:', objective
print 'constraints:', constraints
c.sendInfo('Optimization: it. {}, obj. {}, constr. {}'.format(it,objective,constraints[0]))
- #print 'gradient of objective:', grad_objective
- #print 'gradient of constraints:', grad_constraints
# call MMA and update the current point
optlab.mma.setMoveLimits(lowerBound, upperBound, 1.0e-4)
--
GitLab