Merge Pull Request #6128 from trilinos/Trilinos/piro_remove_deprecate…

…d_tests Automatically Merged using Trilinos Pull Request AutoTester PR Title: Piro: remove deprecated tests with OptiPack and GlobiPack PR Author: kddevin
trilinos · Oct 22, 2019 · a6a597f · a6a597f
2 parents 3da5fc2 + a4acafa
commit a6a597f
Show file tree

Hide file tree

Showing 9 changed files with 4 additions and 64 deletions.
diff --git a/packages/piro/cmake/Piro_config.hpp.in b/packages/piro/cmake/Piro_config.hpp.in
@@ -33,11 +33,9 @@
 #cmakedefine HAVE_PIRO_STOKHOS
 /* DEPRECATED */
 #cmakedefine Piro_ENABLE_Stokhos
-#ifndef OPTIPACK_HIDE_DEPRECATED_CODE
 #cmakedefine HAVE_PIRO_OPTIPACK
 /* DEPRECATED */
 #cmakedefine Piro_ENABLE_OptiPack
-#endif // !OPTIPACK_HIDE_DEPRECATED_CODE
 #cmakedefine HAVE_PIRO_TRIKOTA
 /* DEPRECATED */
 #cmakedefine Piro_ENABLE_TriKota

diff --git a/packages/piro/src/Piro_PerformAnalysis.hpp b/packages/piro/src/Piro_PerformAnalysis.hpp
@@ -49,11 +49,9 @@
 #include "Thyra_ModelEvaluatorDefaultBase.hpp"
 #include "Thyra_VectorStdOps.hpp"
 
-#ifndef OPTIPACK_HIDE_DEPRECATED_CODE
 #ifdef HAVE_PIRO_OPTIPACK
 #include "OptiPack_Config.h"
 #endif
-#endif 
 
 namespace Piro {
 

diff --git a/packages/piro/test/Main_AnalysisDriver.cpp b/packages/piro/test/Main_AnalysisDriver.cpp
@@ -57,6 +57,10 @@
 #include "Teuchos_StandardCatchMacros.hpp"
 
 #include "Piro_ConfigDefs.hpp"
+#ifdef HAVE_PIRO_OPTIPACK
+#include "OptiPack_Config.h"
+#endif
+
 
 int main(int argc, char *argv[]) {
 

diff --git a/packages/piro/test/_input_Analysis_Dakota.xml b/packages/piro/test/_input_Analysis_Dakota.xml
@@ -156,15 +156,5 @@
     </ParameterList>
     <ParameterList name="MOOCHO">
     </ParameterList>
-    <ParameterList name="OptiPack">
-      <Parameter name="Max Num Iterations" type="int" value="20"/>
-      <Parameter name="Objective Gradient Tol" type="double" value="1.0e-6"/>
-      <Parameter name="Solver Type" type="string" value="FR"/>
-    </ParameterList>
-    <ParameterList name="GlobiPack">
-      <ParameterList name="Minimize">
-        <Parameter name="Max Iterations" type="int" value="8"/>
-      </ParameterList>
-    </ParameterList>
   </ParameterList>
 </ParameterList>
diff --git a/packages/piro/test/_input_Analysis_MOOCHO.xml b/packages/piro/test/_input_Analysis_MOOCHO.xml
@@ -163,15 +163,5 @@
         <Parameter name="Explicit Array" type="string" value="{0.0, 0.0}"/>
       </ParameterList>
     </ParameterList>
-    <ParameterList name="OptiPack">
-      <Parameter name="Max Num Iterations" type="int" value="20"/>
-      <Parameter name="Objective Gradient Tol" type="double" value="1.0e-6"/>
-      <Parameter name="Solver Type" type="string" value="FR"/>
-    </ParameterList>
-    <ParameterList name="GlobiPack">
-      <ParameterList name="Minimize">
-        <Parameter name="Max Iterations" type="int" value="8"/>
-      </ParameterList>
-    </ParameterList>
   </ParameterList>
 </ParameterList>
diff --git a/packages/piro/test/_input_Analysis_ROL.xml b/packages/piro/test/_input_Analysis_ROL.xml
@@ -303,15 +303,5 @@
         <Parameter name="Explicit Array" type="string" value="{0.0, 0.0}"/>
       </ParameterList>
     </ParameterList>
-    <ParameterList name="OptiPack">
-      <Parameter name="Max Num Iterations" type="int" value="20"/>
-      <Parameter name="Objective Gradient Tol" type="double" value="1.0e-6"/>
-      <Parameter name="Solver Type" type="string" value="FR"/>
-    </ParameterList>
-    <ParameterList name="GlobiPack">
-      <ParameterList name="Minimize">
-        <Parameter name="Max Iterations" type="int" value="8"/>
-      </ParameterList>
-    </ParameterList>
   </ParameterList>
 </ParameterList>
diff --git a/packages/piro/test/_input_Analysis_ROL_AdjointSensitivities.xml b/packages/piro/test/_input_Analysis_ROL_AdjointSensitivities.xml
@@ -304,15 +304,5 @@
         <Parameter name="Explicit Array" type="string" value="{0.0, 0.0}"/>
       </ParameterList>
     </ParameterList>
-    <ParameterList name="OptiPack">
-      <Parameter name="Max Num Iterations" type="int" value="20"/>
-      <Parameter name="Objective Gradient Tol" type="double" value="1.0e-6"/>
-      <Parameter name="Solver Type" type="string" value="FR"/>
-    </ParameterList>
-    <ParameterList name="GlobiPack">
-      <ParameterList name="Minimize">
-        <Parameter name="Max Iterations" type="int" value="8"/>
-      </ParameterList>
-    </ParameterList>
   </ParameterList>
 </ParameterList>
diff --git a/packages/piro/test/_input_Analysis_ROL_AdjointSensitivities_Tpetra.xml b/packages/piro/test/_input_Analysis_ROL_AdjointSensitivities_Tpetra.xml
@@ -304,15 +304,5 @@
         <Parameter name="Explicit Array" type="string" value="{0.0, 0.0}"/>
       </ParameterList>
     </ParameterList>
-    <ParameterList name="OptiPack">
-      <Parameter name="Max Num Iterations" type="int" value="20"/>
-      <Parameter name="Objective Gradient Tol" type="double" value="1.0e-6"/>
-      <Parameter name="Solver Type" type="string" value="FR"/>
-    </ParameterList>
-    <ParameterList name="GlobiPack">
-      <ParameterList name="Minimize">
-        <Parameter name="Max Iterations" type="int" value="8"/>
-      </ParameterList>
-    </ParameterList>
   </ParameterList>
 </ParameterList>
diff --git a/packages/piro/test/_input_Analysis_ROL_Tpetra.xml b/packages/piro/test/_input_Analysis_ROL_Tpetra.xml
@@ -303,15 +303,5 @@
         <Parameter name="Explicit Array" type="string" value="{0.0, 0.0}"/>
       </ParameterList>
     </ParameterList>
-    <ParameterList name="OptiPack">
-      <Parameter name="Max Num Iterations" type="int" value="20"/>
-      <Parameter name="Objective Gradient Tol" type="double" value="1.0e-6"/>
-      <Parameter name="Solver Type" type="string" value="FR"/>
-    </ParameterList>
-    <ParameterList name="GlobiPack">
-      <ParameterList name="Minimize">
-        <Parameter name="Max Iterations" type="int" value="8"/>
-      </ParameterList>
-    </ParameterList>
   </ParameterList>
 </ParameterList>