Merge pull request #2141 from WelSimLLC/develop

pcarruscag · web-flow · commit 41d252278acd · 2023-10-18T22:58:42.000+01:00
add Cur_Time column to the default history field for transient analysis;
diff --git a/AUTHORS.md b/AUTHORS.md
@@ -98,6 +98,7 @@ Kedar Naik
 Kürşat Yurt
 LaSerpe
 Lennaert Tol
+Liang Cheng
 Lisa Kusch
 Matteo Pini
 Max Aehle
diff --git a/Common/include/parallelization/omp_structure.hpp b/Common/include/parallelization/omp_structure.hpp
@@ -189,14 +189,14 @@ void omp_finalize();
  */
 
 #define BEGIN_SU2_OMP_SAFE_GLOBAL_ACCESS             \
-  SU2_OMP_BARRIER                                    \
+  SU2_OMP_BARRIER;                                   \
   if (omp_in_parallel()) AD::StartNoSharedReading(); \
   SU2_OMP_MASTER
 
 #define END_SU2_OMP_SAFE_GLOBAL_ACCESS             \
   END_SU2_OMP_MASTER                               \
   if (omp_in_parallel()) AD::EndNoSharedReading(); \
-  SU2_OMP_BARRIER
+  SU2_OMP_BARRIER;
 
 #define SU2_OMP_SAFE_GLOBAL_ACCESS(...) BEGIN_SU2_OMP_SAFE_GLOBAL_ACCESS{__VA_ARGS__} END_SU2_OMP_SAFE_GLOBAL_ACCESS
 
diff --git a/SU2_CFD/include/output/COutput.hpp b/SU2_CFD/include/output/COutput.hpp
@@ -806,6 +806,11 @@ class COutput {
    */
   void SetCommonHistoryFields();
 
+  /*!
+   * \brief Request the history fields common for all solvers.
+   */
+  void RequestCommonHistory(bool dynamic);
+
   /*!
    * \brief Parses user-defined outputs.
    */
diff --git a/SU2_CFD/src/output/CAdjFlowCompOutput.cpp b/SU2_CFD/src/output/CAdjFlowCompOutput.cpp
@@ -36,8 +36,7 @@ CAdjFlowCompOutput::CAdjFlowCompOutput(CConfig *config, unsigned short nDim) : C
   /*--- Set the default history fields if nothing is set in the config file ---*/
 
   if (nRequestedHistoryFields == 0) {
-    requestedHistoryFields.emplace_back("ITER");
-    requestedHistoryFields.emplace_back("RMS_RES");
+    RequestCommonHistory(config->GetTime_Domain());
     requestedHistoryFields.emplace_back("SENSITIVITY");
     nRequestedHistoryFields = requestedHistoryFields.size();
   }
diff --git a/SU2_CFD/src/output/CAdjFlowIncOutput.cpp b/SU2_CFD/src/output/CAdjFlowIncOutput.cpp
@@ -42,8 +42,7 @@ CAdjFlowIncOutput::CAdjFlowIncOutput(CConfig *config, unsigned short nDim) : CAd
   /*--- Set the default history fields if nothing is set in the config file ---*/
 
   if (nRequestedHistoryFields == 0) {
-    requestedHistoryFields.emplace_back("ITER");
-    requestedHistoryFields.emplace_back("RMS_RES");
+    RequestCommonHistory(config->GetTime_Domain());
     requestedHistoryFields.emplace_back("SENSITIVITY");
     nRequestedHistoryFields = requestedHistoryFields.size();
   }
diff --git a/SU2_CFD/src/output/CAdjHeatOutput.cpp b/SU2_CFD/src/output/CAdjHeatOutput.cpp
@@ -36,8 +36,7 @@ CAdjHeatOutput::CAdjHeatOutput(CConfig *config, unsigned short nDim) : COutput(c
   /*--- Set the default history fields if nothing is set in the config file ---*/
 
   if (nRequestedHistoryFields == 0){
-    requestedHistoryFields.emplace_back("ITER");
-    requestedHistoryFields.emplace_back("RMS_RES");
+    RequestCommonHistory(config->GetTime_Domain());
     requestedHistoryFields.emplace_back("SENSITIVITY");
     nRequestedHistoryFields = requestedHistoryFields.size();
   }
diff --git a/SU2_CFD/src/output/CElasticityOutput.cpp b/SU2_CFD/src/output/CElasticityOutput.cpp
@@ -43,8 +43,7 @@ CElasticityOutput::CElasticityOutput(CConfig *config, unsigned short nDim) : COu
 
   /*--- Default fields for screen output ---*/
   if (nRequestedHistoryFields == 0){
-    requestedHistoryFields.emplace_back("ITER");
-    requestedHistoryFields.emplace_back("RMS_RES");
+    RequestCommonHistory(dynamic);
     nRequestedHistoryFields = requestedHistoryFields.size();
   }
 
diff --git a/SU2_CFD/src/output/CFlowCompFEMOutput.cpp b/SU2_CFD/src/output/CFlowCompFEMOutput.cpp
@@ -38,8 +38,7 @@ CFlowCompFEMOutput::CFlowCompFEMOutput(CConfig *config, unsigned short nDim) : C
   /*--- Set the default history fields if nothing is set in the config file ---*/
 
   if (nRequestedHistoryFields == 0){
-    requestedHistoryFields.emplace_back("ITER");
-    requestedHistoryFields.emplace_back("RMS_RES");
+    RequestCommonHistory(config->GetTime_Domain());
     nRequestedHistoryFields = requestedHistoryFields.size();
   }
   if (nRequestedScreenFields == 0){
diff --git a/SU2_CFD/src/output/CFlowCompOutput.cpp b/SU2_CFD/src/output/CFlowCompOutput.cpp
@@ -37,8 +37,7 @@ CFlowCompOutput::CFlowCompOutput(const CConfig *config, unsigned short nDim) : C
   /*--- Set the default history fields if nothing is set in the config file ---*/
 
   if (nRequestedHistoryFields == 0){
-    requestedHistoryFields.emplace_back("ITER");
-    requestedHistoryFields.emplace_back("RMS_RES");
+    RequestCommonHistory(config->GetTime_Domain());
     nRequestedHistoryFields = requestedHistoryFields.size();
   }
   if (nRequestedScreenFields == 0){
diff --git a/SU2_CFD/src/output/CFlowIncOutput.cpp b/SU2_CFD/src/output/CFlowIncOutput.cpp
@@ -46,8 +46,7 @@ CFlowIncOutput::CFlowIncOutput(CConfig *config, unsigned short nDim) : CFlowOutp
   /*--- Set the default history fields if nothing is set in the config file ---*/
 
   if (nRequestedHistoryFields == 0){
-    requestedHistoryFields.emplace_back("ITER");
-    requestedHistoryFields.emplace_back("RMS_RES");
+    RequestCommonHistory(config->GetTime_Domain());
     nRequestedHistoryFields = requestedHistoryFields.size();
   }
 
diff --git a/SU2_CFD/src/output/CHeatOutput.cpp b/SU2_CFD/src/output/CHeatOutput.cpp
@@ -35,8 +35,7 @@ CHeatOutput::CHeatOutput(CConfig *config, unsigned short nDim) : CFVMOutput(conf
   /*--- Set the default history fields if nothing is set in the config file ---*/
 
   if (nRequestedHistoryFields == 0){
-    requestedHistoryFields.emplace_back("ITER");
-    requestedHistoryFields.emplace_back("RMS_RES");
+    RequestCommonHistory(config->GetTime_Domain());
     nRequestedHistoryFields = requestedHistoryFields.size();
   }
   if (nRequestedScreenFields == 0){
diff --git a/SU2_CFD/src/output/CMultizoneOutput.cpp b/SU2_CFD/src/output/CMultizoneOutput.cpp
@@ -45,6 +45,7 @@ CMultizoneOutput::CMultizoneOutput(const CConfig* driver_config, const CConfig*
 
   if (nRequestedHistoryFields == 0){
     requestedHistoryFields.emplace_back("ITER");
+    if (config[ZONE_0]->GetTime_Domain()) requestedHistoryFields.emplace_back("CUR_TIME");
     for (iZone = 0; iZone < nZone; iZone++){
       requestedHistoryFields.emplace_back(bgs_res_name + "[" + PrintingToolbox::to_string(iZone) + "]");
       requestedHistoryFields.emplace_back("AVG_RES[" + PrintingToolbox::to_string(iZone) + "]");
diff --git a/SU2_CFD/src/output/CNEMOCompOutput.cpp b/SU2_CFD/src/output/CNEMOCompOutput.cpp
@@ -38,8 +38,7 @@ CNEMOCompOutput::CNEMOCompOutput(const CConfig *config, unsigned short nDim) : C
   /*--- Set the default history fields if nothing is set in the config file ---*/
 
   if (nRequestedHistoryFields == 0){
-    requestedHistoryFields.emplace_back("ITER");
-    requestedHistoryFields.emplace_back("RMS_RES");
+    RequestCommonHistory(config->GetTime_Domain());
     nRequestedHistoryFields = requestedHistoryFields.size();
   }
   if (nRequestedScreenFields == 0){
diff --git a/SU2_CFD/src/output/COutput.cpp b/SU2_CFD/src/output/COutput.cpp
@@ -2017,6 +2017,13 @@ void COutput::SetCommonHistoryFields() {
 
 }
 
+void COutput::RequestCommonHistory(bool dynamic) {
+
+  requestedHistoryFields.emplace_back("ITER");
+  if (dynamic) requestedHistoryFields.emplace_back("CUR_TIME");
+  requestedHistoryFields.emplace_back("RMS_RES");
+}
+
 void COutput::SetCustomOutputs(const CConfig* config) {
 
   const auto& inputString = config->GetCustomOutputs();

Original file line number	Diff line number	Diff line change
`@@ -36,8 +36,7 @@ CAdjFlowCompOutput::CAdjFlowCompOutput(CConfig *config, unsigned short nDim) : C`
`36`	`36`	`/--- Set the default history fields if nothing is set in the config file ---/`
`37`	`37`
`38`	`38`	`if (nRequestedHistoryFields == 0) {`
`39`		`- requestedHistoryFields.emplace_back("ITER");`
`40`		`- requestedHistoryFields.emplace_back("RMS_RES");`
	`39`	`+ RequestCommonHistory(config->GetTime_Domain());`
`41`	`40`	`requestedHistoryFields.emplace_back("SENSITIVITY");`
`42`	`41`	`nRequestedHistoryFields = requestedHistoryFields.size();`
`43`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,8 +42,7 @@ CAdjFlowIncOutput::CAdjFlowIncOutput(CConfig *config, unsigned short nDim) : CAd`
`42`	`42`	`/--- Set the default history fields if nothing is set in the config file ---/`
`43`	`43`
`44`	`44`	`if (nRequestedHistoryFields == 0) {`
`45`		`- requestedHistoryFields.emplace_back("ITER");`
`46`		`- requestedHistoryFields.emplace_back("RMS_RES");`
	`45`	`+ RequestCommonHistory(config->GetTime_Domain());`
`47`	`46`	`requestedHistoryFields.emplace_back("SENSITIVITY");`
`48`	`47`	`nRequestedHistoryFields = requestedHistoryFields.size();`
`49`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,8 +36,7 @@ CAdjHeatOutput::CAdjHeatOutput(CConfig *config, unsigned short nDim) : COutput(c`
`36`	`36`	`/--- Set the default history fields if nothing is set in the config file ---/`
`37`	`37`
`38`	`38`	`if (nRequestedHistoryFields == 0){`
`39`		`- requestedHistoryFields.emplace_back("ITER");`
`40`		`- requestedHistoryFields.emplace_back("RMS_RES");`
	`39`	`+ RequestCommonHistory(config->GetTime_Domain());`
`41`	`40`	`requestedHistoryFields.emplace_back("SENSITIVITY");`
`42`	`41`	`nRequestedHistoryFields = requestedHistoryFields.size();`
`43`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,8 +43,7 @@ CElasticityOutput::CElasticityOutput(CConfig *config, unsigned short nDim) : COu`
`43`	`43`
`44`	`44`	`/--- Default fields for screen output ---/`
`45`	`45`	`if (nRequestedHistoryFields == 0){`
`46`		`- requestedHistoryFields.emplace_back("ITER");`
`47`		`- requestedHistoryFields.emplace_back("RMS_RES");`
	`46`	`+ RequestCommonHistory(dynamic);`
`48`	`47`	`nRequestedHistoryFields = requestedHistoryFields.size();`
`49`	`48`	`}`
`50`	`49`
Original file line number	Diff line number	Diff line change
`@@ -38,8 +38,7 @@ CFlowCompFEMOutput::CFlowCompFEMOutput(CConfig *config, unsigned short nDim) : C`
`38`	`38`	`/--- Set the default history fields if nothing is set in the config file ---/`
`39`	`39`
`40`	`40`	`if (nRequestedHistoryFields == 0){`
`41`		`- requestedHistoryFields.emplace_back("ITER");`
`42`		`- requestedHistoryFields.emplace_back("RMS_RES");`
	`41`	`+ RequestCommonHistory(config->GetTime_Domain());`
`43`	`42`	`nRequestedHistoryFields = requestedHistoryFields.size();`
`44`	`43`	`}`
`45`	`44`	`if (nRequestedScreenFields == 0){`
Original file line number	Diff line number	Diff line change
`@@ -37,8 +37,7 @@ CFlowCompOutput::CFlowCompOutput(const CConfig *config, unsigned short nDim) : C`
`37`	`37`	`/--- Set the default history fields if nothing is set in the config file ---/`
`38`	`38`
`39`	`39`	`if (nRequestedHistoryFields == 0){`
`40`		`- requestedHistoryFields.emplace_back("ITER");`
`41`		`- requestedHistoryFields.emplace_back("RMS_RES");`
	`40`	`+ RequestCommonHistory(config->GetTime_Domain());`
`42`	`41`	`nRequestedHistoryFields = requestedHistoryFields.size();`
`43`	`42`	`}`
`44`	`43`	`if (nRequestedScreenFields == 0){`
Original file line number	Diff line number	Diff line change
`@@ -46,8 +46,7 @@ CFlowIncOutput::CFlowIncOutput(CConfig *config, unsigned short nDim) : CFlowOutp`
`46`	`46`	`/--- Set the default history fields if nothing is set in the config file ---/`
`47`	`47`
`48`	`48`	`if (nRequestedHistoryFields == 0){`
`49`		`- requestedHistoryFields.emplace_back("ITER");`
`50`		`- requestedHistoryFields.emplace_back("RMS_RES");`
	`49`	`+ RequestCommonHistory(config->GetTime_Domain());`
`51`	`50`	`nRequestedHistoryFields = requestedHistoryFields.size();`
`52`	`51`	`}`
`53`	`52`