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

pcarruscag · pcarruscag · commit 1ea8b02e87e9 · 2022-01-09T15:03:44.000Z
diff --git a/Common/src/geometry/meshreader/CCGNSMeshReaderFVM.cpp b/Common/src/geometry/meshreader/CCGNSMeshReaderFVM.cpp
@@ -89,6 +89,7 @@ void CCGNSMeshReaderFVM::OpenCGNSFile(string val_filename) {
   /*--- Check whether the supplied file is truly a CGNS file. ---*/
 
   int file_type;
+  float file_version;
   if (cg_is_cgns(val_filename.c_str(), &file_type) != CG_OK) {
     SU2_MPI::Error(val_filename +
                    string(" was not found or is not a properly formatted") +
@@ -107,7 +108,13 @@ void CCGNSMeshReaderFVM::OpenCGNSFile(string val_filename) {
     cout << "Reading the CGNS file: ";
     cout << val_filename.c_str() << "." << endl;
   }
-
+  if (cg_version(cgnsFileID, &file_version))
+    cg_error_exit();
+  if (rank == MASTER_NODE) {
+    if (file_version < 4.0) {
+      cout << "WARNING: The CGNS file version (" << file_version << ")  is old and may cause high memory usage issues, consider updating the file with the cgnsupdate tool.\n";
+    }
+  }
 }
 
 void CCGNSMeshReaderFVM::ReadCGNSDatabaseMetadata() {
diff --git a/SU2_CFD/src/numerics/NEMO/CNEMONumerics.cpp b/SU2_CFD/src/numerics/NEMO/CNEMONumerics.cpp
@@ -53,7 +53,7 @@ CNEMONumerics::CNEMONumerics(unsigned short val_nDim, unsigned short val_nVar,
     EDDY_VISC_INDEX = nSpecies+nDim+9;
 
     /*--- Read from CConfig ---*/
-    implicit   = (config->GetKind_TimeIntScheme() == EULER_IMPLICIT);
+    implicit   = (config->GetKind_TimeIntScheme_Flow() == EULER_IMPLICIT);
 
     ionization = config->GetIonization();
     if (ionization) { nHeavy = nSpecies-1; nEl = 1; }
