Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Found on bunya make fails (unless nlopt disabled) due to mpi.rank #487

Merged
merged 7 commits into from
Jan 10, 2024
Merged

Found on bunya make fails (unless nlopt disabled) due to mpi.rank #487

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3f50902
+ fix compile to grab c string from cpp string
Sep 18, 2023
998038c
Merge branch 'CFD-GO:develop' into develop
TravisMitchell Oct 19, 2023
d43ad1b
Merge branch 'CFD-GO:develop' into develop
TravisMitchell Nov 13, 2023
f5d00cb
Merge branch 'CFD-GO:develop' into develop
TravisMitchell Dec 7, 2023
472db73
Merge branch 'CFD-GO:develop' into develop
TravisMitchell Jan 10, 2024
3fd87e7
+ minor update so that compile works when nlopt is found
Jan 10, 2024
948cd34
Merge branch 'CFD-GO:develop' into develop
TravisMitchell Jan 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/Handlers/acOptimize.cpp.Rt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ int acOptimize::OptimizerInit () {
pugi::xml_attribute attr;
nlopt_result res;
material=0.0;
if (solver->mpi.rank == 0) {
if (solver->mpi_rank == 0) {
if (Pars == 0) {
ERROR("Error: No parameters defined!\n");
return -1;
Expand All @@ -18,7 +18,7 @@ int acOptimize::OptimizerInit () {
}
GetParameters(start);
DEBUG_M;
if (solver->mpi.rank == 0) {
if (solver->mpi_rank == 0) {
method="MMA";
attr = node.attribute("method");
if (attr) {
Expand All @@ -40,15 +40,15 @@ int acOptimize::OptimizerInit () {
}
}
double * bound = NULL;
if (solver->mpi.rank == 0) bound = new double[Pars];
if (solver->mpi_rank == 0) bound = new double[Pars];
Parameters(PAR_LOWER, bound);
if (solver->mpi.rank == 0) {
if (solver->mpi_rank == 0) {
output("lower set to %lf\n", bound[0]);
nlopt_set_lower_bounds(opt, bound);
for (int i=0;i<Pars;i++) if (start[i] < bound[i]) start[i] = bound[i];
}
Parameters(PAR_UPPER, bound);
if (solver->mpi.rank == 0) {
if (solver->mpi_rank == 0) {
output("upper set to %lf\n", bound[0]);
nlopt_set_upper_bounds(opt, bound);
for (int i=0;i<Pars;i++) if (start[i] > bound[i]) start[i] = bound[i];
Expand Down
Loading