fix FEA examples

Author: pcarruscag

SU2_CFD/src/output/CElasticityOutput.cpp

@@ -169,12 +169,15 @@ void CElasticityOutput::SetHistoryOutputFields(CConfig *config){
   AddHistoryOutput("LOAD_INCREMENT", "Load[%]",  ScreenOutputFormat::PERCENT,    "", "LOAD_INCREMENT");
   AddHistoryOutput("LOAD_RAMP",      "Load_Ramp",ScreenOutputFormat::FIXED,      "", "LOAD_RAMP");
 
-  AddHistoryOutput("REFERENCE_GEOMETRY", "RefGeom", ScreenOutputFormat::SCIENTIFIC, "STRUCT_COEFF", "", HistoryFieldType::COEFFICIENT);
-  AddHistoryOutput("REFERENCE_NODE",     "RefNode", ScreenOutputFormat::SCIENTIFIC, "STRUCT_COEFF", "", HistoryFieldType::COEFFICIENT);
-  AddHistoryOutput("VOLUME_FRACTION",    "VolFrac", ScreenOutputFormat::SCIENTIFIC, "STRUCT_COEFF", "", HistoryFieldType::COEFFICIENT);
-  AddHistoryOutput("TOPOL_DISCRETENESS", "TopDisc", ScreenOutputFormat::SCIENTIFIC, "STRUCT_COEFF", "", HistoryFieldType::COEFFICIENT);
-  AddHistoryOutput("TOPOL_COMPLIANCE",   "TopComp", ScreenOutputFormat::SCIENTIFIC, "STRUCT_COEFF", "", HistoryFieldType::COEFFICIENT);
-
+  AddHistoryOutput("REFERENCE_NODE", "RefNode", ScreenOutputFormat::SCIENTIFIC, "STRUCT_COEFF", "", HistoryFieldType::COEFFICIENT);
+  AddHistoryOutput("TOPOL_COMPLIANCE", "TopComp", ScreenOutputFormat::SCIENTIFIC, "STRUCT_COEFF", "", HistoryFieldType::COEFFICIENT);
+  if (config->GetRefGeom()) {
+    AddHistoryOutput("REFERENCE_GEOMETRY", "RefGeom", ScreenOutputFormat::SCIENTIFIC, "STRUCT_COEFF", "", HistoryFieldType::COEFFICIENT);
+  }
+  if (config->GetTopology_Optimization()) {
+    AddHistoryOutput("VOLUME_FRACTION", "VolFrac", ScreenOutputFormat::SCIENTIFIC, "STRUCT_COEFF", "", HistoryFieldType::COEFFICIENT);
+    AddHistoryOutput("TOPOL_DISCRETENESS", "TopDisc", ScreenOutputFormat::SCIENTIFIC, "STRUCT_COEFF", "", HistoryFieldType::COEFFICIENT);
+  }
 }
 
 void CElasticityOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint){

SU2_PY/topology_optimization.py

@@ -122,7 +122,12 @@ def obj_val(self,x):
 
     try:
       sp.call(self._objValCommand,shell=True)
-      fid = open(self._objValFile,"r"); val = float(fid.readlines()[1]); fid.close()
+      with open(self._objValFile,"r") as fid:
+        lines = fid.readlines()
+      for col,name in enumerate(lines[0].split(",")):
+        if "TopComp" in name:
+          val = float(lines[1].split(",")[col])
+          break
       # the return code of mpirun is useless, we test the value of the function
       self._assert_isfinite(val)
     except:
@@ -161,15 +166,13 @@ def obj_der(self,x):
   def con_val(self,x):
     # inputs written in obj_val_driver
 
-    # clear previous output and run solver
-    try:    os.remove(self._conValFile)
-    except: pass
-    try:    os.remove(self._conDerFile)
-    except: pass
-
     try:
-      sp.call(self._conDerCommand,shell=True)
-      fid = open(self._conValFile,"r"); val = float(fid.readlines()[1]); fid.close()
+      with open(self._conValFile,"r") as fid:
+        lines = fid.readlines()
+      for col,name in enumerate(lines[0].split(",")):
+        if "VolFrac" in name:
+          val = float(lines[1].split(",")[col])
+          break
       self._assert_isfinite(val)
     except:
       raise RuntimeError("Constraint function evaluation failed")
@@ -181,12 +184,16 @@ def con_val(self,x):
   def con_der(self,x):
     # inputs written in obj_val_driver
 
-    # adjoint solver already ran
+    # clear previous output and run solver
+    try:    os.remove(self._conDerFile)
+    except: pass
     N = x.shape[0]
     y = np.ndarray((N,))
 
     # read result
     try:
+      sp.call(self._conDerCommand,shell=True)
+
       fid = open(self._conDerFile,"r"); lines = fid.readlines(); fid.close()
       for i in range(N):
         val = float(lines[i][0:-1])

TestCases/fea_fsi/MixElemsKnowles/config.cfg

@@ -4,7 +4,7 @@
 % Case description: Tip-loaded 3D cantilever beam, mix of element types,       %
 %                   nonlinear elasticity with Knowles material model.          %
 % Institution: Imperial College London                                         %
-% File Version 7.0.8 "Blackbird"                                                  %
+% File Version 7.0.8 "Blackbird"                                               %
 %                                                                              %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
@@ -51,4 +51,5 @@ TABULAR_FORMAT= CSV
 RESTART_SOL= YES
 SOLUTION_FILENAME= solution_structure.dat
 
-SCREEN_OUTPUT=(INNER_ITER, RMS_UTOL, RMS_RTOL, RMS_ETOL, COMBO, VMS)
+HISTORY_OUTPUT= (ITER, RMS_RES, STRUCT_COEFF)
+SCREEN_OUTPUT=(INNER_ITER, RMS_UTOL, RMS_RTOL, RMS_ETOL, REFERENCE_NODE, VMS)

TestCases/fea_topology/quick_start/settings.cfg

@@ -46,4 +46,4 @@ TABULAR_FORMAT= CSV
 SOLUTION_FILENAME= direct.dat
 RESTART_FILENAME= direct.dat
 OUTPUT_FILES= RESTART, PARAVIEW
-HISTORY_OUTPUT= COMBO
+HISTORY_OUTPUT= STRUCT_COEFF

TestCases/fea_topology/quick_start/settings_compliance.cfg

@@ -48,5 +48,4 @@ TABULAR_FORMAT= CSV
 SOLUTION_FILENAME= direct.dat
 RESTART_FILENAME= direct.dat
 OUTPUT_FILES= PARAVIEW
-HISTORY_OUTPUT= COMBO
 

TestCases/fea_topology/quick_start/settings_volfrac.cfg

@@ -48,5 +48,4 @@ TABULAR_FORMAT= CSV
 SOLUTION_FILENAME= direct.dat
 RESTART_FILENAME= direct.dat
 OUTPUT_FILES= PARAVIEW
-HISTORY_OUTPUT= COMBO