Shapeopt/update for kratos 9 (#97)

* update examples for Kratos version 9.0 * clean python scripts
KratosMultiphysics · Jan 4, 2022 · be9aa3b · be9aa3b
1 parent 8134429
commit be9aa3b
Show file tree

Hide file tree

Showing 19 changed files with 9 additions and 123 deletions.
diff --git a/shape_optimization/use_cases/01_Strain_Energy_Minimization_3D_Hook/run_optimization.py b/shape_optimization/use_cases/01_Strain_Energy_Minimization_3D_Hook/run_optimization.py
@@ -1,6 +1,3 @@
-# Making KratosMultiphysics backward compatible with python 2.6 and 2.7
-from __future__ import print_function, absolute_import, division
-
 # Import Kratos core and apps
 import KratosMultiphysics as KM
 

diff --git a/shape_optimization/use_cases/02_Strain_Energy_Minimization_3D_Shell/primal_parameters.json b/shape_optimization/use_cases/02_Strain_Energy_Minimization_3D_Shell/primal_parameters.json
@@ -21,18 +21,6 @@
         "material_import_settings": {
             "materials_filename": "materials_2D.json"
         },
-        "line_search": false,
-        "convergence_criterion": "residual_criterion",
-        "displacement_relative_tolerance": 0.0001,
-        "displacement_absolute_tolerance": 1e-9,
-        "residual_relative_tolerance": 0.0001,
-        "residual_absolute_tolerance": 1e-9,
-        "max_iteration": 10,
-        "linear_solver_settings": {
-            "solver_type": "EigenSolversApplication.sparse_lu",
-            "scaling": false,
-            "verbosity": 0
-        },
         "rotation_dofs": true
     },
     "processes": {
@@ -140,13 +128,7 @@
                 "help": "This process writes postprocessing files for VTK",
                 "Parameters": {
                     "model_part_name": "3D_Shell",
-                    "file_format": "binary",
-                    "output_precision": 7,
-                    "output_control_type": "step",
-                    "output_interval": 1.0,
-                    "output_sub_model_parts": false,
                     "folder_name": "Primal_Results",
-                    "save_output_files_in_folder": true,
                     "nodal_solution_step_data_variables": [
                         "DISPLACEMENT",
                         "REACTION",

diff --git a/shape_optimization/use_cases/02_Strain_Energy_Minimization_3D_Shell/run_optimization.py b/shape_optimization/use_cases/02_Strain_Energy_Minimization_3D_Shell/run_optimization.py
@@ -1,6 +1,3 @@
-# Making KratosMultiphysics backward compatible with python 2.6 and 2.7
-from __future__ import print_function, absolute_import, division
-
 # Import Kratos core and apps
 import KratosMultiphysics as KM
 

diff --git a/...e_optimization/use_cases/03_mesh_independent_optimization_3D_Shell/primal_parameters.json b/...e_optimization/use_cases/03_mesh_independent_optimization_3D_Shell/primal_parameters.json
@@ -21,18 +21,6 @@
             "material_import_settings" :{
             "materials_filename": "materials_2D.json"
         },
-        "line_search"                        : false,
-        "convergence_criterion"              : "residual_criterion",
-        "displacement_relative_tolerance"    : 0.0001,
-        "displacement_absolute_tolerance"    : 1e-9,
-        "residual_relative_tolerance"        : 0.0001,
-        "residual_absolute_tolerance"        : 1e-9,
-        "max_iteration"                      : 10,
-        "linear_solver_settings"             : {
-            "solver_type" : "ExternalSolversApplication.super_lu",
-            "scaling"     : false,
-            "verbosity"   : 0
-        },
         "rotation_dofs"                      : true
     },
     "processes": {

diff --git a/shape_optimization/use_cases/03_mesh_independent_optimization_3D_Shell/run_optimization.py b/shape_optimization/use_cases/03_mesh_independent_optimization_3D_Shell/run_optimization.py
@@ -1,6 +1,3 @@
-# Making KratosMultiphysics backward compatible with python 2.6 and 2.7
-from __future__ import print_function, absolute_import, division
-
 # Import Kratos core and apps
 import KratosMultiphysics as KM
 

diff --git a/...ation/use_cases/04_Eigenfrequency_Maximization_3D_Cantilever/optimization_parameters.json b/...ation/use_cases/04_Eigenfrequency_Maximization_3D_Cantilever/optimization_parameters.json
@@ -38,11 +38,6 @@
                         "time_step"       : 1.0
                     },
                     "domain_size"     : 3,
-                    "mesh_motion_linear_solver_settings"  : {
-                        "solver_type" : "ExternalSolversApplication.super_lu",
-                        "scaling"     : false,
-                        "verbosity"   : 0
-                    },
                     "compute_reactions"     : true
                 }
             }
@@ -111,7 +106,7 @@
                                           "SHAPE_UPDATE",
                                           "SHAPE_CHANGE" ],
             "output_format" : {
-                "name": "gid"
+                "name": "vtk"
             }
         }
     }

diff --git a/...ptimization/use_cases/04_Eigenfrequency_Maximization_3D_Cantilever/primal_parameters.json b/...ptimization/use_cases/04_Eigenfrequency_Maximization_3D_Cantilever/primal_parameters.json
@@ -22,10 +22,9 @@
            "materials_filename": "materials.json"
        },
         "eigensolver_settings":{
-            "solver_type": "eigen_eigensystem",
+            "solver_type": "spectra_sym_g_eigs_shift",
             "number_of_eigenvalues": 2,
             "max_iteration": 1000,
-            "tolerance": 1e-6,
             "echo_level": 1
         },
         "rotation_dofs"                      : false

diff --git a/...e_optimization/use_cases/04_Eigenfrequency_Maximization_3D_Cantilever/run_optimization.py b/...e_optimization/use_cases/04_Eigenfrequency_Maximization_3D_Cantilever/run_optimization.py
@@ -1,6 +1,3 @@
-# Making KratosMultiphysics backward compatible with python 2.6 and 2.7
-from __future__ import print_function, absolute_import, division
-
 # Import Kratos core and apps
 import KratosMultiphysics as KM
 

diff --git a/shape_optimization/use_cases/05_Constrained_Shell_Opt/optimization_parameters.json b/shape_optimization/use_cases/05_Constrained_Shell_Opt/optimization_parameters.json
@@ -117,7 +117,7 @@
                                           "SHAPE_UPDATE",
                                           "SHAPE_CHANGE" ],
             "output_format" : {
-                "name": "gid"
+                "name": "vtk"
             }
         }
     }

diff --git a/shape_optimization/use_cases/05_Constrained_Shell_Opt/primal_parameters.json b/shape_optimization/use_cases/05_Constrained_Shell_Opt/primal_parameters.json
@@ -21,16 +21,6 @@
             "material_import_settings" :{
             "materials_filename": "materials_2D.json"
         },
-        "line_search"                        : false,
-        "convergence_criterion"              : "residual_criterion",
-        "displacement_relative_tolerance"    : 0.0001,
-        "displacement_absolute_tolerance"    : 1e-9,
-        "residual_relative_tolerance"        : 0.0001,
-        "residual_absolute_tolerance"        : 1e-9,
-        "max_iteration"                      : 10,
-        "linear_solver_settings"             : {
-            "solver_type" : "ExternalSolversApplication.super_lu"
-        },
         "rotation_dofs"                      : true
     },
     "processes": {

diff --git a/shape_optimization/use_cases/05_Constrained_Shell_Opt/run_optimization.py b/shape_optimization/use_cases/05_Constrained_Shell_Opt/run_optimization.py
@@ -1,12 +1,9 @@
-# Making KratosMultiphysics backward compatible with python 2.6 and 2.7
-from __future__ import print_function, absolute_import, division
-
 # Import Kratos core and apps
 import KratosMultiphysics as KM
 
 # Additional imports
 from KratosMultiphysics.ShapeOptimizationApplication import optimizer_factory
-from KratosMultiphysics.ShapeOptimizationApplication.analyzer_base import AnalyzerBaseClass
+from KratosMultiphysics.ShapeOptimizationApplication.analyzers.analyzer_base import AnalyzerBaseClass
 
 # Read parameters
 with open("optimization_parameters.json",'r') as parameter_file:

diff --git a/shape_optimization/use_cases/06_bead_optimization_plate/analysis_parameters.json b/shape_optimization/use_cases/06_bead_optimization_plate/analysis_parameters.json
@@ -22,18 +22,6 @@
         "material_import_settings": {
             "materials_filename": "2D_material.json"
         },
-        "line_search": false,
-        "convergence_criterion": "residual_criterion",
-        "displacement_relative_tolerance": 0.0001,
-        "displacement_absolute_tolerance": 1e-9,
-        "residual_relative_tolerance": 0.0001,
-        "residual_absolute_tolerance": 1e-9,
-        "max_iteration": 10,
-        "linear_solver_settings": {
-            "solver_type": "EigenSolversApplication.sparse_lu",
-            "scaling": false,
-            "verbosity": 0
-        },
         "rotation_dofs": true
     },
     "processes": {

diff --git a/shape_optimization/use_cases/06_bead_optimization_plate/optimization_parameters.json b/shape_optimization/use_cases/06_bead_optimization_plate/optimization_parameters.json
@@ -44,8 +44,7 @@
             "type": "vertex_morphing",
             "filter": {
                 "filter_function_type": "linear",
-                "filter_radius": 0.075,
-                "max_nodes_in_filter_radius": 1000
+                "filter_radius": 0.075
             }
         },
         "optimization_algorithm": {
@@ -71,6 +70,7 @@
                 "DF1DALPHA",
                 "DF1DALPHA_MAPPED",
                 "DPDALPHA",
+                "DLDALPHA",
                 "ALPHA",
                 "ALPHA_MAPPED",
                 "CONTROL_POINT_CHANGE",

diff --git a/..._optimization/use_cases/07_optimization_plate_with_step_adaption/analysis_parameters.json b/..._optimization/use_cases/07_optimization_plate_with_step_adaption/analysis_parameters.json
@@ -22,18 +22,6 @@
           "material_import_settings" :{
           "materials_filename": "2D_material.json"
       },
-      "line_search"                        : false,
-      "convergence_criterion"              : "residual_criterion",
-      "displacement_relative_tolerance"    : 0.0001,
-      "displacement_absolute_tolerance"    : 1e-9,
-      "residual_relative_tolerance"        : 0.0001,
-      "residual_absolute_tolerance"        : 1e-9,
-      "max_iteration"                      : 10,
-      "linear_solver_settings"             : {
-          "solver_type" : "ExternalSolversApplication.super_lu",
-          "scaling"     : false,
-          "verbosity"   : 0
-      },
       "rotation_dofs"                      : true
   },
   "processes" : {

diff --git a/shape_optimization/use_cases/08_Optimization_3D_Hook_plane_constraint/run_optimization.py b/shape_optimization/use_cases/08_Optimization_3D_Hook_plane_constraint/run_optimization.py
@@ -1,6 +1,3 @@
-# Making KratosMultiphysics backward compatible with python 2.6 and 2.7
-from __future__ import print_function, absolute_import, division
-
 # Import Kratos core and apps
 import KratosMultiphysics as KM
 

diff --git a/shape_optimization/use_cases/09_Packaging_3D_Shell/run_optimization.py b/shape_optimization/use_cases/09_Packaging_3D_Shell/run_optimization.py
@@ -1,12 +1,9 @@
-# Making KratosMultiphysics backward compatible with python 2.6 and 2.7
-from __future__ import print_function, absolute_import, division
-
 # Import Kratos core and apps
 import KratosMultiphysics as KM
 
 # Additional imports
 from KratosMultiphysics.ShapeOptimizationApplication import optimizer_factory
-from KratosMultiphysics.ShapeOptimizationApplication.analyzer_base import AnalyzerBaseClass
+from KratosMultiphysics.ShapeOptimizationApplication.analyzers.analyzer_base import AnalyzerBaseClass
 
 # Read parameters
 with open("optimization_parameters.json",'r') as parameter_file:

diff --git a/...timization/use_cases/10_Multi_Constraint_Optimization_3D_Hook/primal_parameters_main.json b/...timization/use_cases/10_Multi_Constraint_Optimization_3D_Hook/primal_parameters_main.json
@@ -22,16 +22,6 @@
             "material_import_settings" :{
             "materials_filename": "materials_3D.json"
         },
-        "line_search"                        : false,
-        "convergence_criterion"              : "Residual_criterion",
-        "displacement_relative_tolerance"    : 0.0001,
-        "displacement_absolute_tolerance"    : 1e-9,
-        "residual_relative_tolerance"        : 0.0001,
-        "residual_absolute_tolerance"        : 1e-9,
-        "max_iteration"                      : 10,
-        "linear_solver_settings"             : {
-            "solver_type"         : "LinearSolversApplication.pardiso_llt"
-        },
         "rotation_dofs"                      : false
     },
     "processes": {
@@ -78,13 +68,7 @@
             "process_name"  : "VTKOutputProcess",
             "Parameters"    : {
                 "model_part_name": "3D_Hook",
-                "file_format": "binary",
-                "output_precision": 7,
-                "output_control_type": "step",
-                "output_interval": 1.0,
-                "output_sub_model_parts": false,
                 "folder_name": "Primal_Results_main",
-                "save_output_files_in_folder": true,
                 "nodal_solution_step_data_variables": ["DISPLACEMENT","REACTION"],
                 "nodal_data_value_variables": [],
                 "element_data_value_variables": [],

diff --git a/shape_optimization/use_cases/10_Multi_Constraint_Optimization_3D_Hook/run_optimization.py b/shape_optimization/use_cases/10_Multi_Constraint_Optimization_3D_Hook/run_optimization.py
@@ -1,14 +1,11 @@
-# Making KratosMultiphysics backward compatible with python 2.6 and 2.7
-from __future__ import print_function, absolute_import, division
-
 # Import Kratos core and apps
 import KratosMultiphysics as KM
 
 # Additional imports
 import KratosMultiphysics.ShapeOptimizationApplication as KSO
-from KratosMultiphysics.ShapeOptimizationApplication import optimizer_factory, analyzer_base
+from KratosMultiphysics.ShapeOptimizationApplication import optimizer_factory
 from KratosMultiphysics.StructuralMechanicsApplication import structural_response_function_factory as csm_response_factory
-from KratosMultiphysics.ShapeOptimizationApplication.analyzer_base import AnalyzerBaseClass
+from KratosMultiphysics.ShapeOptimizationApplication.analyzers.analyzer_base import AnalyzerBaseClass
 
 # Read parameters
 with open("optimization_parameters.json", 'r') as parameter_file:

diff --git a/shape_optimization/use_cases/11_Shape_Update_Optimization_Stanford_Bunny/run_optimization.py b/shape_optimization/use_cases/11_Shape_Update_Optimization_Stanford_Bunny/run_optimization.py
@@ -1,11 +1,7 @@
-# Making KratosMultiphysics backward compatible with python 2.6 and 2.7
-from __future__ import print_function, absolute_import, division
-
 # Import Kratos core and apps
 import KratosMultiphysics as KM
 
 # Additional imports
-import KratosMultiphysics.ShapeOptimizationApplication as KSO
 from KratosMultiphysics.ShapeOptimizationApplication import optimizer_factory
 
 # Read parameters