Commit 1eda9fd3 authored by Dave Moxey's avatar Dave Moxey
Browse files

Merge branch 'fix/FC-outputpoints-noequispaced' into 'master'

Fix FieldConvert when using --noequispaced combined with --output-points

See merge request !775
parents d187e94c d2b21447
...@@ -35,6 +35,7 @@ v4.4.1 ...@@ -35,6 +35,7 @@ v4.4.1
**FieldConvert:** **FieldConvert:**
- Fix issue with field ordering in the interppointdatatofld module (!754) - Fix issue with field ordering in the interppointdatatofld module (!754)
- Fix issue with FieldConvert when range flag used (!761) - Fix issue with FieldConvert when range flag used (!761)
- Fix issue when using output-points combined with noequispaced (!775)
**NekMesh**: **NekMesh**:
- Fix memory consumption issue with Gmsh output (!747, !762) - Fix memory consumption issue with Gmsh output (!747, !762)
......
...@@ -353,7 +353,7 @@ void InputXml::Process(po::variables_map &vm) ...@@ -353,7 +353,7 @@ void InputXml::Process(po::variables_map &vm)
} }
// reset expansion defintion to use equispaced points if required. // reset expansion defintion to use equispaced points if required.
if (m_requireEquiSpaced || vm.count("output-points")) if (m_requireEquiSpaced)
{ {
int nPointsNew = 0; int nPointsNew = 0;
......
...@@ -54,9 +54,9 @@ int main(int argc, char* argv[]) ...@@ -54,9 +54,9 @@ int main(int argc, char* argv[])
("modules-list,l", ("modules-list,l",
"Print the list of available modules.") "Print the list of available modules.")
("output-points,n", po::value<int>(), ("output-points,n", po::value<int>(),
"Output at n equipspaced points along the collapsed coordinates (for .dat, .vtk).") "Output at n points along the collapsed coordinates (for .dat, .vtu).")
("output-points-hom-z", po::value<int>(), ("output-points-hom-z", po::value<int>(),
"Number of planes in the z-direction for output of Homogeneous 1D expansion(for .dat, .vtk).") "Number of planes in the z-direction for output of Homogeneous 1D expansion(for .dat, .vtu).")
("error,e", ("error,e",
"Write error of fields for regression checking") "Write error of fields for regression checking")
("forceoutput,f", ("forceoutput,f",
...@@ -64,7 +64,7 @@ int main(int argc, char* argv[]) ...@@ -64,7 +64,7 @@ int main(int argc, char* argv[])
("range,r", po::value<string>(), ("range,r", po::value<string>(),
"Define output range i.e. (-r xmin,xmax,ymin,ymax,zmin,zmax) " "Define output range i.e. (-r xmin,xmax,ymin,ymax,zmin,zmax) "
"in which any vertex is contained.") "in which any vertex is contained.")
("noequispaced","Do not use equispaced output. Currently stops the output-points option") ("noequispaced","Do not use equispaced output.")
("nprocs", po::value<int>(), ("nprocs", po::value<int>(),
"Used to define nprocs if running serial problem to mimic " "Used to define nprocs if running serial problem to mimic "
"parallel run.") "parallel run.")
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment