Skip to content

Commit

Permalink
Updated the integration test due to an issue for SLSQP v2 scripts.
Browse files Browse the repository at this point in the history
  • Loading branch information
friedenhe committed Sep 16, 2023
1 parent 4dd9404 commit d04daaf
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 26 deletions.
42 changes: 21 additions & 21 deletions tests/refs/DAFoam_Test_IntegrationRef.txt
Original file line number Diff line number Diff line change
@@ -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
@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
10 changes: 5 additions & 5 deletions tests/runTests_Integration.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down

0 comments on commit d04daaf

Please sign in to comment.