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

Clean up a warning & set Werror for Pamgen #5113

Merged
merged 2 commits into from
May 14, 2019
Merged

Clean up a warning & set Werror for Pamgen #5113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fbdc418
Issue 3178 Set Werror for Pamgen in GCC 7.2.0 build
ZUUL42 May 6, 2019
8c4e442
Issue 5104 Remove unused-variable lines to remove warnings
ZUUL42 May 9, 2019
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
2 changes: 1 addition & 1 deletion cmake/std/PullRequestLinuxGCC7.2.0TestingSettings.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ set (ML_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror" CACHE STRING "Warnings as errors
set (MueLu_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror" CACHE STRING "Warnings as errors setting")
set (NOX_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror" CACHE STRING "Warnings as errors setting")
set (OptiPack_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror" CACHE STRING "Warnings as errors setting")
#set (Pamgen_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror" CACHE STRING "Warnings as errors setting")
set (Pamgen_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror" CACHE STRING "Warnings as errors setting")
set (Panzer_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror" CACHE STRING "Warnings as errors setting")
set (Phalanx_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror" CACHE STRING "Warnings as errors setting")
set (Pike_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror" CACHE STRING "Warnings as errors setting")
Expand Down
7 changes: 2 additions & 5 deletions packages/pamgen/mesh_spec_lt/pamgen_mesh_specification.C
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1066,11 +1066,8 @@ Mesh_Specification * Mesh_Specification::consolidateMS()
border_element_list_size += ms->getMSI(NUM_BORDER_ELEMS);

long long * const * scnid = ms->getMSPP(ms_lt::Mesh_Specification::COMM_NODE_IDS);
long long * const * scnpid = ms->getMSPP(ms_lt::Mesh_Specification::COMM_NODE_PROC_IDS);

long long * const * sceid = ms->getMSPP(ms_lt::Mesh_Specification::COMM_ELEM_IDS);
long long * const * scsid = ms->getMSPP(ms_lt::Mesh_Specification::COMM_SIDE_IDS);
long long * const * scepid = ms->getMSPP(ms_lt::Mesh_Specification::COMM_ELEM_PROC_IDS);

{
int nncm = ms->getMSI(NUM_NODE_COMM_MAPS);
Expand All @@ -1082,7 +1079,7 @@ Mesh_Specification * Mesh_Specification::consolidateMS()

for (long long nctr = 0; nctr < nnodes; nctr ++){
(node_proc_ids[proc_id]).push_back(scnid[ict][nctr]+node_offset);
assert(proc_id == scnpid[ict][nctr]);
assert(proc_id == ms->getMSPP(ms_lt::Mesh_Specification::COMM_NODE_PROC_IDS)[ict][nctr]);
}
}
}
Expand All @@ -1097,7 +1094,7 @@ Mesh_Specification * Mesh_Specification::consolidateMS()
long long nels = ecmap_cnts[ict];
for(long long ectr = 0; ectr < nels;ectr++){
(element_proc_ids[proc_id]).push_back(std::pair<long,long>(sceid[ict][ectr]+element_offset,scsid[ict][ectr]));
assert(proc_id == scepid[ict][ectr]);
assert(proc_id == ms->getMSPP(ms_lt::Mesh_Specification::COMM_ELEM_PROC_IDS)[ict][ectr]);
}
}
}
Expand Down