Merge remote-tracking branch 'upstream/develop' into consistent_py_wrapper_func_names

pcarruscag · pcarruscag · commit 86e6509b76f9 · 2023-03-21T04:01:16.000Z
diff --git a/.gitignore b/.gitignore
@@ -100,3 +100,6 @@ ninja
 
 # Ignore SU2 pre-configuration timestamp created by preconfigure.py
 su2preconfig.timestamp
+
+# Clangd server files
+.cache
diff --git a/SU2_CFD/include/drivers/CDriver.hpp b/SU2_CFD/include/drivers/CDriver.hpp
@@ -365,7 +365,7 @@ class CDriver : public CDriverBase {
   /*!
    * \brief Deallocation routine
    */
-  void Postprocessing();
+  void Finalize();
 
   /*!
    * \brief A virtual member.
diff --git a/SU2_CFD/include/drivers/CDriverBase.hpp b/SU2_CFD/include/drivers/CDriverBase.hpp
@@ -120,7 +120,7 @@ class CDriverBase {
   /*!
    * \brief A virtual member.
    */
-  virtual void Postprocessing(){}
+  virtual void Finalize(){}
 
 /// \addtogroup PySU2
 /// @{
@@ -651,7 +651,7 @@ class CDriverBase {
   /*!
    * \brief Delete containers.
    */
-  void CommonPostprocessing();
+  void CommonFinalize();
 
   /*!
    * \brief Read in the config and mesh files.
diff --git a/SU2_CFD/src/SU2_CFD.cpp b/SU2_CFD/src/SU2_CFD.cpp
@@ -154,9 +154,9 @@ int main(int argc, char *argv[]) {
 
   driver->StartSolver();
 
-  /*--- Postprocess all the containers, close history file, exit SU2. ---*/
+  /*--- Finalize solver, delete all the containers, close history file, exit SU2. ---*/
 
-  driver->Postprocessing();
+  driver->Finalize();
 
   delete driver;
 
diff --git a/SU2_CFD/src/drivers/CDriver.cpp b/SU2_CFD/src/drivers/CDriver.cpp
@@ -346,7 +346,7 @@ void CDriver::SetContainers_Null(){
 }
 
 
-void CDriver::Postprocessing() {
+void CDriver::Finalize() {
 
   const bool wrt_perf = config_container[ZONE_0]->GetWrt_Performance();
 
@@ -363,7 +363,7 @@ void CDriver::Postprocessing() {
   }
 
   if (rank == MASTER_NODE)
-    cout << endl <<"------------------------- Solver Postprocessing -------------------------" << endl;
+    cout << endl <<"------------------------- Finalizing Solver -------------------------" << endl;
 
   for (iZone = 0; iZone < nZone; iZone++) {
     for (iInst = 0; iInst < nInst[iZone]; iInst++){
diff --git a/SU2_CFD/src/drivers/CDriverBase.cpp b/SU2_CFD/src/drivers/CDriverBase.cpp
@@ -84,7 +84,7 @@ void CDriverBase::SetContainers_Null() {
   }
 }
 
-void CDriverBase::CommonPostprocessing() {
+void CDriverBase::CommonFinalize() {
 
   if (numerics_container != nullptr) {
     for (iZone = 0; iZone < nZone; iZone++) {
diff --git a/SU2_DEF/include/drivers/CDeformationDriver.hpp b/SU2_DEF/include/drivers/CDeformationDriver.hpp
@@ -66,7 +66,7 @@ class CDeformationDriver : public CDriverBase {
   /*!
    * \brief Deallocation routine.
    */
-  void Postprocessing();
+  void Finalize();
 
   /*!
    * \brief Communicate boundary mesh displacements.
diff --git a/SU2_DEF/include/drivers/CDiscAdjDeformationDriver.hpp b/SU2_DEF/include/drivers/CDiscAdjDeformationDriver.hpp
@@ -57,7 +57,7 @@ class CDiscAdjDeformationDriver : public CDriverBase {
   /*!
    * \brief Deallocation routine.
    */
-  void Postprocessing();
+  void Finalize();
 
  protected:
   /*!
diff --git a/SU2_DEF/src/SU2_DEF.cpp b/SU2_DEF/src/SU2_DEF.cpp
@@ -63,7 +63,7 @@ int main(int argc, char* argv[]) {
 
   /*--- Postprocess all the containers, close history file, and exit SU2. ---*/
 
-  driver.Postprocessing();
+  driver.Finalize();
 
   /*--- Finalize MPI parallelization. ---*/
 
diff --git a/SU2_DEF/src/drivers/CDeformationDriver.cpp b/SU2_DEF/src/drivers/CDeformationDriver.cpp
@@ -535,9 +535,8 @@ void CDeformationDriver::Output() {
   }
 }
 
-void CDeformationDriver::Postprocessing() {
-  if (rank == MASTER_NODE)
-    cout << "\n------------------------- Solver Postprocessing -------------------------" << endl;
+void CDeformationDriver::Finalize() {
+  if (rank == MASTER_NODE) cout << "\n------------------------- Finalize Solver -------------------------" << endl;
 
   if (driver_config->GetDeform_Mesh()) {
     for (iZone = 0; iZone < nZone; iZone++) {
@@ -550,7 +549,7 @@ void CDeformationDriver::Postprocessing() {
         delete[] numerics_container[iZone][INST_0][MESH_0];
         delete[] numerics_container[iZone][INST_0];
       }
-      /*--- The remaining levels in the container are deleted in CommonPostprocessing ---*/
+      /*--- The remaining levels in the container are deleted in CommonFinalize ---*/
     }
 
     for (iZone = 0; iZone < nZone; iZone++) {
@@ -559,11 +558,11 @@ void CDeformationDriver::Postprocessing() {
         delete[] solver_container[iZone][INST_0][MESH_0];
         delete[] solver_container[iZone][INST_0];
       }
-      /*--- The remaining levels in the container are deleted in CommonPostprocessing ---*/
+      /*--- The remaining levels in the container are deleted in CommonFinalize ---*/
     }
   }
 
-  CommonPostprocessing();
+  CommonFinalize();
 
   /*--- Exit the solver cleanly. ---*/
 
diff --git a/SU2_DEF/src/drivers/CDiscAdjDeformationDriver.cpp b/SU2_DEF/src/drivers/CDiscAdjDeformationDriver.cpp
@@ -367,16 +367,15 @@ void CDiscAdjDeformationDriver::Run() {
   OutputGradient(Gradient, config_container[ZONE_0], Gradient_file);
 }
 
-void CDiscAdjDeformationDriver::Postprocessing() {
+void CDiscAdjDeformationDriver::Finalize() {
   for (auto iDV = 0u; iDV < config_container[ZONE_0]->GetnDV(); iDV++) {
     delete[] Gradient[iDV];
   }
   delete[] Gradient;
 
-  if (rank == MASTER_NODE)
-    cout << "\n------------------------- Solver Postprocessing -------------------------" << endl;
+  if (rank == MASTER_NODE) cout << "\n------------------------- Finalize Solver  -------------------------" << endl;
 
-  CommonPostprocessing();
+  CommonFinalize();
 
   /*--- Exit the solver cleanly. ---*/
 
diff --git a/SU2_DOT/src/SU2_DOT.cpp b/SU2_DOT/src/SU2_DOT.cpp
@@ -66,7 +66,7 @@ int main(int argc, char* argv[]) {
 
   /*--- Postprocess all the containers, close history file, and exit SU2. ---*/
 
-  driver.Postprocessing();
+  driver.Finalize();
 
   /*--- Finalize AD. ---*/
 
diff --git a/SU2_GEO/src/SU2_GEO.cpp b/SU2_GEO/src/SU2_GEO.cpp
@@ -1429,7 +1429,7 @@ int main(int argc, char* argv[]) {
   }
 
   if (rank == MASTER_NODE)
-    cout << endl << "------------------------- Solver Postprocessing -------------------------" << endl;
+    cout << endl << "------------------------- Finalize Solver -------------------------" << endl;
 
   delete[] Xcoord_Airfoil;
   delete[] Ycoord_Airfoil;
diff --git a/SU2_PY/SU2_CFD.py b/SU2_PY/SU2_CFD.py
@@ -160,8 +160,8 @@ def main():
     # Launch the solver for the entire computation
     SU2Driver.StartSolver()
 
-    # Postprocess the solver and exit cleanly
-    SU2Driver.Postprocessing()
+    # Finalize the solver and exit cleanly
+    SU2Driver.Finalize()
 
     if SU2Driver != None:
         del SU2Driver
diff --git a/SU2_PY/fsi_computation.py b/SU2_PY/fsi_computation.py
@@ -231,7 +231,7 @@ def main():
         comm.barrier()
 
     # --- Exit cleanly the fluid and solid solvers --- #
-    FluidSolver.Postprocessing()
+    FluidSolver.Finalize()
     if myid == rootProcess:
         SolidSolver.exit()
 
diff --git a/SU2_SOL/src/SU2_SOL.cpp b/SU2_SOL/src/SU2_SOL.cpp
@@ -685,7 +685,7 @@ int main(int argc, char* argv[]) {
   config = nullptr;
 
   if (rank == MASTER_NODE)
-    cout << endl << "------------------------- Solver Postprocessing -------------------------" << endl;
+    cout << endl << "------------------------- Finalize Solver -------------------------" << endl;
 
   if (geometry_container != nullptr) {
     for (iZone = 0; iZone < nZone; iZone++) {
diff --git a/TestCases/py_wrapper/deforming_bump_in_channel/run.py b/TestCases/py_wrapper/deforming_bump_in_channel/run.py
@@ -88,8 +88,8 @@ def main():
     TimeIter += 1
     time += deltaT
 
-  # Postprocess the solver and exit cleanly
-  SU2Driver.Postprocessing()
+  # Finalize the solver and exit cleanly
+  SU2Driver.Finalize()
 
 
 # Imposed deformation
diff --git a/TestCases/py_wrapper/disc_adj_fea/flow_load_sens/run_adjoint.py b/TestCases/py_wrapper/disc_adj_fea/flow_load_sens/run_adjoint.py
@@ -118,8 +118,8 @@ def main():
     print("Sens[0]\tSens[1]\tDisp[0]\tDisp[1]\t")
     print(100, 100, sens[0][0], sens[0][1], disp[0][0], disp[0][1])
 
-  # Postprocess the solver and exit cleanly
-  SU2Driver.Postprocessing()
+  # Finalize the solver and exit cleanly
+  SU2Driver.Finalize()
 
 
 
diff --git a/TestCases/py_wrapper/disc_adj_flow/mesh_disp_sens/run_adjoint.py b/TestCases/py_wrapper/disc_adj_flow/mesh_disp_sens/run_adjoint.py
@@ -115,8 +115,8 @@ def main():
     if (iVertex == 30) and rank == 0:
       print(1000,1000,iVertex, sensX, sensY, sensZ)
 
-  # Postprocess the solver and exit cleanly
-  SU2Driver.Postprocessing()
+  # Finalize the solver and exit cleanly
+  SU2Driver.Finalize()
 
 
 
diff --git a/TestCases/py_wrapper/flatPlate_rigidMotion/launch_flatPlate_rigidMotion.py b/TestCases/py_wrapper/flatPlate_rigidMotion/launch_flatPlate_rigidMotion.py
@@ -134,8 +134,8 @@ def main():
     TimeIter += 1
     time += deltaT
 
-  # Postprocess the solver and exit cleanly
-  SU2Driver.Postprocessing()
+  # Finalize the solver and exit cleanly
+  SU2Driver.Finalize()
 
 
 # -------------------------------------------------------------------

Original file line number	Diff line number	Diff line change
`@@ -346,7 +346,7 @@ void CDriver::SetContainers_Null(){`
`346`	`346`	`}`
`347`	`347`
`348`	`348`
`349`		`-void CDriver::Postprocessing() {`
	`349`	`+void CDriver::Finalize() {`
`350`	`350`
`351`	`351`	`const bool wrt_perf = config_container[ZONE_0]->GetWrt_Performance();`
`352`	`352`
`@@ -363,7 +363,7 @@ void CDriver::Postprocessing() {`
`363`	`363`	`}`
`364`	`364`
`365`	`365`	`if (rank == MASTER_NODE)`
`366`		`- cout << endl <<"------------------------- Solver Postprocessing -------------------------" << endl;`
	`366`	`+ cout << endl <<"------------------------- Finalizing Solver -------------------------" << endl;`
`367`	`367`
`368`	`368`	`for (iZone = 0; iZone < nZone; iZone++) {`
`369`	`369`	`for (iInst = 0; iInst < nInst[iZone]; iInst++){`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ void CDriverBase::SetContainers_Null() {`
`84`	`84`	`}`
`85`	`85`	`}`
`86`	`86`
`87`		`-void CDriverBase::CommonPostprocessing() {`
	`87`	`+void CDriverBase::CommonFinalize() {`
`88`	`88`
`89`	`89`	`if (numerics_container != nullptr) {`
`90`	`90`	`for (iZone = 0; iZone < nZone; iZone++) {`
Original file line number	Diff line number	Diff line change
`@@ -535,9 +535,8 @@ void CDeformationDriver::Output() {`
`535`	`535`	`}`
`536`	`536`	`}`
`537`	`537`
`538`		`-void CDeformationDriver::Postprocessing() {`
`539`		`- if (rank == MASTER_NODE)`
`540`		`- cout << "\n------------------------- Solver Postprocessing -------------------------" << endl;`
	`538`	`+void CDeformationDriver::Finalize() {`
	`539`	`+ if (rank == MASTER_NODE) cout << "\n------------------------- Finalize Solver -------------------------" << endl;`
`541`	`540`
`542`	`541`	`if (driver_config->GetDeform_Mesh()) {`
`543`	`542`	`for (iZone = 0; iZone < nZone; iZone++) {`
`@@ -550,7 +549,7 @@ void CDeformationDriver::Postprocessing() {`
`550`	`549`	`delete[] numerics_container[iZone][INST_0][MESH_0];`
`551`	`550`	`delete[] numerics_container[iZone][INST_0];`
`552`	`551`	`}`
`553`		`- /--- The remaining levels in the container are deleted in CommonPostprocessing ---/`
	`552`	`+ /--- The remaining levels in the container are deleted in CommonFinalize ---/`
`554`	`553`	`}`
`555`	`554`
`556`	`555`	`for (iZone = 0; iZone < nZone; iZone++) {`
`@@ -559,11 +558,11 @@ void CDeformationDriver::Postprocessing() {`
`559`	`558`	`delete[] solver_container[iZone][INST_0][MESH_0];`
`560`	`559`	`delete[] solver_container[iZone][INST_0];`
`561`	`560`	`}`
`562`		`- /--- The remaining levels in the container are deleted in CommonPostprocessing ---/`
	`561`	`+ /--- The remaining levels in the container are deleted in CommonFinalize ---/`
`563`	`562`	`}`
`564`	`563`	`}`
`565`	`564`
`566`		`- CommonPostprocessing();`
	`565`	`+ CommonFinalize();`
`567`	`566`
`568`	`567`	`/--- Exit the solver cleanly. ---/`
`569`	`568`