clean up

Ccore/ccore_common.pro

@@ -61,7 +61,7 @@ DesignSpace =
 Optimizer = 
   DefineNumber[0, Name "Optimization/Algorithm",
                Choices {0="scipy", 
-                        1="mma"}];
+                        1="conveks"}];
 w = 
   DefineNumber[0, Name "Optimization/Results/w", 
 	       Graph "030000000000000000000000000000000000"];

Ccore/OnelabOptimize.py → Ccore/onelab_optimize.py

@@ -180,7 +180,6 @@ def Optimize(Optimizer):
 def minimize(name):
     global x, modelName, file_geo, file_pro, file_msh, mygmsh, mygetdp, maxIter, maxChange
     modelName = name
-    
     # get gmsh and getdp locations from Gmsh options
     mygmsh = c.getString('General.ExecutableFileName')
     mygetdp = ''
@@ -206,6 +205,7 @@ def minimize(name):
     mygmsh += ' -p 0 -v 2 -parametric ' + file_geo + ' '
     mygetdp += ' -p 0 ' + file_pro + ' -msh ' + file_msh + ' '
 
+
     # load geometry in GUI to have something to look at
     c.openProject(file_geo)
 
@@ -238,10 +238,6 @@ def minimize(name):
     for i, val in designParameters.iteritems():
         print i, val
     
-    ## Optimizer2 = c.defineString('Optimization/Algorithm', value='scipy',
-    ##                            choices=('mma', 'scipy'))
-    ## print Optimizer2
-    
     maxIter = c.defineNumber('Optimization/00Max iterations', value=30, visible=1)
     maxChange = c.defineNumber('Optimization/01Max change', value=1e-4,  visible=1)
 
@@ -256,6 +252,8 @@ def minimize(name):
     Optimize(Optimizer)
     
     
+## modelName = c.defineString('Optimization/Model name', value='')
+## if modelName=='':
+##     exit(1)
 
-
-    
+## minimize()