From d04daaff7bce4fc07656b4abcbe4234fd6df66dd Mon Sep 17 00:00:00 2001
From: Ping He <phe@iastate.edu>
Date: Sat, 16 Sep 2023 12:06:10 -0500
Subject: [PATCH] Updated the integration test due to an issue for SLSQP v2
 scripts.

---
 tests/refs/DAFoam_Test_IntegrationRef.txt | 42 +++++++++++------------
 tests/runTests_Integration.py             | 10 +++---
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/tests/refs/DAFoam_Test_IntegrationRef.txt b/tests/refs/DAFoam_Test_IntegrationRef.txt
index d12df3f3..65c7ed68 100755
--- a/tests/refs/DAFoam_Test_IntegrationRef.txt
+++ b/tests/refs/DAFoam_Test_IntegrationRef.txt
@@ -1,23 +1,23 @@
 Dictionary Key: alpha
-@value    4.983717286274688 1e-06 1e-08
+@value    4.968905604685552 1e-06 1e-08
 Dictionary Key: shapey
-@value -0.007921636479688784 1e-06 1e-08
-@value -0.00792163647968879 1e-06 1e-08
-@value 0.007921636479688784 1e-06 1e-08
-@value 0.007921636479688784 1e-06 1e-08
-@value -0.03828250734496957 1e-06 1e-08
-@value -0.03828250734496957 1e-06 1e-08
-@value  0.01296166604998152 1e-06 1e-08
-@value  0.01296166604998153 1e-06 1e-08
-@value -0.01007603172079106 1e-06 1e-08
-@value -0.01007603172079106 1e-06 1e-08
-@value 0.006776111843578327 1e-06 1e-08
-@value 0.006776111843578336 1e-06 1e-08
-@value -0.006275224171581452 1e-06 1e-08
-@value -0.00627522417158145 1e-06 1e-08
-@value 0.006469681351950167 1e-06 1e-08
-@value  0.00646968135195016 1e-06 1e-08
-@value -0.001009411824693773 1e-06 1e-08
-@value -0.001009411824693775 1e-06 1e-08
-@value 0.001009411824693774 1e-06 1e-08
-@value  0.00100941182469377 1e-06 1e-08
\ No newline at end of file
+@value 8.655069785387594e-05 1e-06 1e-08
+@value 8.655069785387594e-05 1e-06 1e-08
+@value -8.655069785387605e-05 1e-06 1e-08
+@value -8.655069785387605e-05 1e-06 1e-08
+@value -0.01119217936982357 1e-06 1e-08
+@value -0.01119217936982357 1e-06 1e-08
+@value -0.007799868290607725 1e-06 1e-08
+@value -0.007799868290607725 1e-06 1e-08
+@value 0.0004216141178557599 1e-06 1e-08
+@value 0.0004216141178557599 1e-06 1e-08
+@value -0.001760513948823865 1e-06 1e-08
+@value -0.001760513948823865 1e-06 1e-08
+@value 0.0005508325823005192 1e-06 1e-08
+@value 0.0005508325823005192 1e-06 1e-08
+@value 0.001951434242102298 1e-06 1e-08
+@value 0.001951434242102298 1e-06 1e-08
+@value 9.201202606960528e-05 1e-06 1e-08
+@value 9.201202606960528e-05 1e-06 1e-08
+@value -9.201202606960528e-05 1e-06 1e-08
+@value -9.201202606960528e-05 1e-06 1e-08
\ No newline at end of file
diff --git a/tests/runTests_Integration.py b/tests/runTests_Integration.py
index c75e5320..2d214ed8 100755
--- a/tests/runTests_Integration.py
+++ b/tests/runTests_Integration.py
@@ -104,9 +104,9 @@
 }
 
 optOptions = {
-    "ACC": 1.0e-5,  # convergence accuracy
-    "MAXIT": 2,  # max optimization iterations
-    "IFILE": "opt_SLSQP.out",
+    "tol": 1.0e-5,
+    "max_iter": 2,
+    "output_file": "opt_IPOPT.txt",
 }
 
 # DVGeo
@@ -217,8 +217,8 @@ def setMultiPointObjFuncsSens(xDVs, funcsMP, funcsSens, funcsSensMP, index):
 if gcomm.rank == 0:
     print(optProb)
 
-opt = OPT("slsqp", options=optOptions)
-histFile = os.path.join("./", "slsqp_hist.hst")
+opt = OPT("ipopt", options=optOptions)
+histFile = os.path.join("./", "ipopt_hist.hst")
 sol = opt(optProb, sens=optFuncs.calcObjFuncSensMP, storeHistory=histFile)
 
 if gcomm.rank == 0: