Merge pull request #1105 from su2code/nan_checks_better_defaults

Nan checks and better discrete adjoint default options

Author: pcarruscag

Common/src/CConfig.cpp

@@ -1087,8 +1087,13 @@ void CConfig::SetConfig_Options() {
   addBoolOption("MULTIZONE", Multizone_Problem, NO);
   /*!\brief PHYSICAL_PROBLEM \n DESCRIPTION: Physical governing equations \n Options: see \link Solver_Map \endlink \n DEFAULT: NO_SOLVER \ingroup Config*/
   addEnumOption("MULTIZONE_SOLVER", Kind_MZSolver, Multizone_Map, MZ_BLOCK_GAUSS_SEIDEL);
+#ifdef CODI_REVERSE_TYPE
+  const bool discAdjDefault = true;
+#else
+  const bool discAdjDefault = false;
+#endif
   /*!\brief MATH_PROBLEM  \n DESCRIPTION: Mathematical problem \n  Options: DIRECT, ADJOINT \ingroup Config*/
-  addMathProblemOption("MATH_PROBLEM", ContinuousAdjoint, false, DiscreteAdjoint, false, Restart_Flow, false);
+  addMathProblemOption("MATH_PROBLEM", ContinuousAdjoint, false, DiscreteAdjoint, discAdjDefault, Restart_Flow, discAdjDefault);
   /*!\brief KIND_TURB_MODEL \n DESCRIPTION: Specify turbulence model \n Options: see \link Turb_Model_Map \endlink \n DEFAULT: NO_TURB_MODEL \ingroup Config*/
   addEnumOption("KIND_TURB_MODEL", Kind_Turb_Model, Turb_Model_Map, NO_TURB_MODEL);
   /*!\brief KIND_TRANS_MODEL \n DESCRIPTION: Specify transition model OPTIONS: see \link Trans_Model_Map \endlink \n DEFAULT: NO_TRANS_MODEL \ingroup Config*/
@@ -4856,6 +4861,10 @@ void CConfig::SetPostprocessing(unsigned short val_software, unsigned short val_
     }
 #endif
 
+    /*--- Use the same linear solver on the primal as the one used in the adjoint. ---*/
+    Kind_Linear_Solver = Kind_DiscAdj_Linear_Solver;
+    Kind_Linear_Solver_Prec = Kind_DiscAdj_Linear_Prec;
+
     /*--- Disable writing of limiters if enabled ---*/
     Wrt_Limiters = false;
 

SU2_CFD/src/output/COutput.cpp

@@ -839,6 +839,11 @@ bool COutput::Convergence_Monitoring(CConfig *config, unsigned long Iteration) {
     if (historyOutput_Map.count(convField) > 0){
       su2double monitor = historyOutput_Map.at(convField).value;
 
+      /*--- Stop the simulation in case a nan appears, do not save the solution ---*/
+      if (isnan(SU2_TYPE::GetValue(monitor))) {
+        SU2_MPI::Error("SU2 has diverged (NaN detected).", CURRENT_FUNCTION);
+      }
+
       /*--- Cauchy based convergence criteria ---*/
 
       if (historyOutput_Map.at(convField).fieldType == HistoryFieldType::COEFFICIENT) {
@@ -962,6 +967,11 @@ bool COutput::MonitorTimeConvergence(CConfig *config, unsigned long TimeIteratio
       if (historyOutput_Map.count(WndConv_Field) > 0){
         su2double monitor = historyOutput_Map[WndConv_Field].value;
 
+        /*--- Stop the simulation in case a nan appears, do not save the solution ---*/
+        if (isnan(SU2_TYPE::GetValue(monitor))) {
+          SU2_MPI::Error("SU2 has diverged (NaN detected).", CURRENT_FUNCTION);
+        }
+
         /*--- Cauchy based convergence criteria ---*/
 
         if (historyOutput_Map[WndConv_Field].fieldType == HistoryFieldType::AUTO_COEFFICIENT) { //TAVG values are AUTO_COEFF
@@ -996,11 +1006,6 @@ bool COutput::MonitorTimeConvergence(CConfig *config, unsigned long TimeIteratio
           SetHistoryOutputValue("CAUCHY_" + WndConv_Field, WndCauchy_Value);
         }
         TimeConvergence = fieldConverged && TimeConvergence;
-
-        /*--- Stop the simulation in case a nan appears, do not save the solution ---*/
-
-        if (monitor != monitor){
-          SU2_MPI::Error("SU2 has diverged (NaN detected).", CURRENT_FUNCTION);}
       }
     }
 

config_template.cfg

@@ -33,6 +33,7 @@ KIND_SGS_MODEL= NONE
 KIND_VERIFICATION_SOLUTION= NO_VERIFICATION_SOLUTION
 %
 % Mathematical problem (DIRECT, CONTINUOUS_ADJOINT, DISCRETE_ADJOINT)
+% Defaults to DISCRETE_ADJOINT for the SU2_*_AD codes, and to DIRECT otherwise.
 MATH_PROBLEM= DIRECT
 %
 % Axisymmetric simulation, only compressible flows (NO, YES)
@@ -976,13 +977,13 @@ ADJ_JST_SENSOR_COEFF= ( 0.5, 0.02 )
 % BCGSTAB, FGMRES, RESTARTED_FGMRES, CONJUGATE_GRADIENT (self-adjoint problems only), SMOOTHER.
 LINEAR_SOLVER= FGMRES
 %
-% Same for discrete adjoint (smoothers not supported)
+% Same for discrete adjoint (smoothers not supported), replaces LINEAR_SOLVER in SU2_*_AD codes.
 DISCADJ_LIN_SOLVER= FGMRES
 %
 % Preconditioner of the Krylov linear solver or type of smoother (ILU, LU_SGS, LINELET, JACOBI)
 LINEAR_SOLVER_PREC= ILU
 %
-% Same for discrete adjoint (JACOBI or ILU)
+% Same for discrete adjoint (JACOBI or ILU), replaces LINEAR_SOLVER_PREC in SU2_*_AD codes.
 DISCADJ_LIN_PREC= ILU
 %
 % Linael solver ILU preconditioner fill-in level (0 by default)