Commit 339d7f78 authored by Spencer Sherwin's avatar Spencer Sherwin
Browse files

Merge remote-tracking branch 'upstream/master'

parents 6f0a076d 931c6e71
......@@ -35,6 +35,8 @@ v4.4.1
**FieldConvert:**
- Fix issue with field ordering in the interppointdatatofld module (!754)
- Fix issue with FieldConvert when range flag used (!761)
- Fix issue when using output-points combined with noequispaced (!775)
- Fix equispacedoutput for 3DH1D with triangles (!787)
**NekMesh**:
- Fix memory consumption issue with Gmsh output (!747, !762)
......
......@@ -353,7 +353,7 @@ void InputXml::Process(po::variables_map &vm)
}
// reset expansion defintion to use equispaced points if required.
if (m_requireEquiSpaced || vm.count("output-points"))
if (m_requireEquiSpaced)
{
int nPointsNew = 0;
......
......@@ -656,14 +656,14 @@ void ProcessEquiSpacedOutput::SetHomogeneousConnectivity(void)
}
// Interior numbering
int mode = np+1;
edge2 = 0;
for (int n = 1; n < np-1; n++)
{
edge2 += np+1-n;
for (int m = 1; m < np-n-1; m++)
{
vId[cnt1+mode] = 4*nel + maxN*4*nel + cnt2;
vId[cnt1+edge2+m] = 4*nel + maxN*4*nel + cnt2;
cnt2++;
mode++;
}
}
cnt1+= newpoints;
......
......@@ -54,9 +54,9 @@ int main(int argc, char* argv[])
("modules-list,l",
"Print the list of available modules.")
("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>(),
"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",
"Write error of fields for regression checking")
("forceoutput,f",
......@@ -64,7 +64,7 @@ int main(int argc, char* argv[])
("range,r", po::value<string>(),
"Define output range i.e. (-r xmin,xmax,ymin,ymax,zmin,zmax) "
"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>(),
"Used to define nprocs if running serial problem to mimic "
"parallel run.")
......
Markdown is supported
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