Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions benchmarks/benchmark_Balloon.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -323,10 +323,10 @@ int main (int argc, char** argv)
arcLength->initialize();


gsParaviewCollection collection(dirname + "/" + output);
gsParaviewCollection Smembrane(dirname + "/" + "membrane");
gsParaviewCollection Sflexural(dirname + "/" + "flexural");
gsParaviewCollection Smembrane_p(dirname + "/" + "membrane_p");
gsParaviewCollection<> collection(dirname + "/" + output);
gsParaviewCollection<> Smembrane(dirname + "/" + "membrane");
gsParaviewCollection<> Sflexural(dirname + "/" + "flexural");
gsParaviewCollection<> Smembrane_p(dirname + "/" + "membrane_p");
gsMultiPatch<> deformation = mp;

// Make objects for previous solutions
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/benchmark_Beam.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ int main (int argc, char** argv)
arcLength->initialize();


gsParaviewCollection collection(dirname + "/" + output);
gsParaviewCollection<> collection(dirname + "/" + output);
gsMultiPatch<> deformation = mp;

// Make objects for previous solutions
Expand Down
6 changes: 3 additions & 3 deletions benchmarks/benchmark_Beam_APALM.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -446,7 +446,7 @@ int main (int argc, char** argv)
times = apalm.getFlatTimes(b);
levels = apalm.getFlatLevels(b);

gsParaviewCollection dataCollection(dirname + "/" + "data_branch"+std::to_string(b));
gsParaviewCollection<> dataCollection(dirname + "/" + "data_branch"+std::to_string(b));
gsStructuralAnalysisOutput<real_t> data(dirname + "/data_branch"+std::to_string(b)+".csv",refPoints);
if (write)
data.init(pointheaders,otherheaders);
Expand Down Expand Up @@ -517,7 +517,7 @@ int main (int argc, char** argv)
times = apalm.getFlatTimes(b);
levels = apalm.getFlatLevels(b);

gsParaviewCollection dataCollection(dirname + "/" + "data_serial_branch"+std::to_string(b));
gsParaviewCollection<> dataCollection(dirname + "/" + "data_serial_branch"+std::to_string(b));
gsStructuralAnalysisOutput<real_t> data(dirname + "/data_serial_branch"+std::to_string(b)+".csv",refPoints);
if (write)
data.init(pointheaders,otherheaders);
Expand Down Expand Up @@ -589,7 +589,7 @@ int main (int argc, char** argv)
times = apalm.getFlatTimes(b);
levels = apalm.getFlatLevels(b);

gsParaviewCollection dataCollection(dirname + "/" + "data_parallel_branch"+std::to_string(b));
gsParaviewCollection<> dataCollection(dirname + "/" + "data_parallel_branch"+std::to_string(b));
gsStructuralAnalysisOutput<real_t> data(dirname + "/data_parallel_branch"+std::to_string(b)+".csv",refPoints);
if (write)
data.init(pointheaders,otherheaders);
Expand Down
8 changes: 4 additions & 4 deletions benchmarks/benchmark_Cylinder.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -317,10 +317,10 @@ int main (int argc, char** argv)
arcLength->initialize();


gsParaviewCollection collection(dirname + "/" + output);
gsParaviewCollection Smembrane(dirname + "/" + "membrane");
gsParaviewCollection Sflexural(dirname + "/" + "flexural");
gsParaviewCollection Smembrane_p(dirname + "/" + "membrane_p");
gsParaviewCollection<> collection(dirname + "/" + output);
gsParaviewCollection<> Smembrane(dirname + "/" + "membrane");
gsParaviewCollection<> Sflexural(dirname + "/" + "flexural");
gsParaviewCollection<> Smembrane_p(dirname + "/" + "membrane_p");
gsMultiPatch<> deformation = mp;

// Make objects for previous solutions
Expand Down
4 changes: 2 additions & 2 deletions benchmarks/benchmark_Elasticity_Beam_APALM.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,7 @@ int main (int argc, char** argv)
times = apalm.getFlatTimes(b);
levels = apalm.getFlatLevels(b);

gsParaviewCollection dataCollection(dirname + "/" + "data_serial_branch"+std::to_string(b));
gsParaviewCollection<> dataCollection(dirname + "/" + "data_serial_branch"+std::to_string(b));
gsStructuralAnalysisOutput<real_t> data(dirname + "/data_serial_branch"+std::to_string(b)+".csv",refPoints);
if (write)
data.init(pointheaders,otherheaders);
Expand Down Expand Up @@ -499,7 +499,7 @@ int main (int argc, char** argv)
times = apalm.getFlatTimes(b);
levels = apalm.getFlatLevels(b);

gsParaviewCollection dataCollection(dirname + "/" + "data_parallel_branch"+std::to_string(b));
gsParaviewCollection<> dataCollection(dirname + "/" + "data_parallel_branch"+std::to_string(b));
gsStructuralAnalysisOutput<real_t> data(dirname + "/data_parallel_branch"+std::to_string(b)+".csv",refPoints);
if (write)
data.init(pointheaders,otherheaders);
Expand Down
8 changes: 4 additions & 4 deletions benchmarks/benchmark_FrustrumALM.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -356,10 +356,10 @@ int main (int argc, char** argv)
arcLength->initialize();


gsParaviewCollection collection(dirname + "/" + output);
gsParaviewCollection Smembrane(dirname + "/" + "membrane");
gsParaviewCollection Sflexural(dirname + "/" + "flexural");
gsParaviewCollection Smembrane_p(dirname + "/" + "membrane_p");
gsParaviewCollection<> collection(dirname + "/" + output);
gsParaviewCollection<> Smembrane(dirname + "/" + "membrane");
gsParaviewCollection<> Sflexural(dirname + "/" + "flexural");
gsParaviewCollection<> Smembrane_p(dirname + "/" + "membrane_p");
gsMultiPatch<> deformation = mp;

gsMatrix<> solVector;
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/benchmark_FrustrumDC.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ int main (int argc, char** argv)
materialMatrix = getMaterialMatrix<3,real_t>(mp,t,parameters,rho,options);
}

gsParaviewCollection collection(dirname + "/" + output);
gsParaviewCollection<> collection(dirname + "/" + output);
gsMultiPatch<> deformation = mp;

gsMatrix<> solVector;
Expand Down
6 changes: 3 additions & 3 deletions benchmarks/benchmark_Frustrum_APALM.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -532,7 +532,7 @@ int main (int argc, char** argv)
std::vector<std::string> pointheaders = {"u_x","u_y","u_z"};
std::vector<std::string> otherheaders = {"lambda","level"};

gsParaviewCollection dataCollection(dirname + "/" + "data");
gsParaviewCollection<> dataCollection(dirname + "/" + "data");
gsStructuralAnalysisOutput<real_t> data(dirname + "/data.csv",refPoints);
if (write)
data.init(pointheaders,otherheaders);
Expand Down Expand Up @@ -616,7 +616,7 @@ int main (int argc, char** argv)
std::vector<std::string> pointheaders = {"u_x","u_y","u_z"};
std::vector<std::string> otherheaders = {"lambda","level"};

gsParaviewCollection dataCollection(dirname + "/" + "data_serial");
gsParaviewCollection<> dataCollection(dirname + "/" + "data_serial");
gsStructuralAnalysisOutput<real_t> data(dirname + "/data_serial.csv",refPoints);
if (write)
data.init(pointheaders,otherheaders);
Expand Down Expand Up @@ -684,7 +684,7 @@ int main (int argc, char** argv)
std::vector<std::string> pointheaders = {"u_x","u_y","u_z"};
std::vector<std::string> otherheaders = {"lambda","level"};

gsParaviewCollection dataCollection2(dirname + "/" + "data_parallel");
gsParaviewCollection<> dataCollection2(dirname + "/" + "data_parallel");
gsStructuralAnalysisOutput<real_t> data2(dirname + "/data_parallel.csv",refPoints);
if (write)
data2.init(pointheaders,otherheaders);
Expand Down
12 changes: 6 additions & 6 deletions benchmarks/benchmark_MaterialTest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -449,12 +449,12 @@ int main (int argc, char** argv)
arcLength->applyOptions();
arcLength->initialize();

gsParaviewCollection collection(dirname + "/" + output);
gsParaviewCollection PStretch(dirname + "/" + "stretch");
gsParaviewCollection PStretch1dir(dirname + "/" + "stretch1dir");
gsParaviewCollection PStretch2dir(dirname + "/" + "stretch2dir");
gsParaviewCollection Smembrane(dirname + "/" + "membrane");
gsParaviewCollection Smembrane_p(dirname + "/" + "membrane_p");
gsParaviewCollection<> collection(dirname + "/" + output);
gsParaviewCollection<> PStretch(dirname + "/" + "stretch");
gsParaviewCollection<> PStretch1dir(dirname + "/" + "stretch1dir");
gsParaviewCollection<> PStretch2dir(dirname + "/" + "stretch2dir");
gsParaviewCollection<> Smembrane(dirname + "/" + "membrane");
gsParaviewCollection<> Smembrane_p(dirname + "/" + "membrane_p");
gsMultiPatch<> deformation = mp;

gsMatrix<> solVector;
Expand Down
4 changes: 2 additions & 2 deletions benchmarks/benchmark_Pillow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -301,8 +301,8 @@ int main (int argc, char** argv)
writePoints.col(1)<<0,0;
writePoints.col(2)<<0,1;

gsParaviewCollection TFcollection(dirname + "/" + "tensionfield");
gsParaviewCollection solcollection(dirname + "/" + "solution");
gsParaviewCollection<> TFcollection(dirname + "/" + "tensionfield");
gsParaviewCollection<> solcollection(dirname + "/" + "solution");

gsStructuralAnalysisOutput<real_t> writer(dirname + "/" + wn,writePoints);
std::vector<std::string> pointheaders = {"x","y","z"};
Expand Down
8 changes: 4 additions & 4 deletions benchmarks/benchmark_Roof.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -382,10 +382,10 @@ int main (int argc, char** argv)
arcLength->initialize();


gsParaviewCollection collection(dirname + "/" + output);
gsParaviewCollection Smembrane(dirname + "/" + "membrane");
gsParaviewCollection Sflexural(dirname + "/" + "flexural");
gsParaviewCollection Smembrane_p(dirname + "/" + "membrane_p");
gsParaviewCollection<> collection(dirname + "/" + output);
gsParaviewCollection<> Smembrane(dirname + "/" + "membrane");
gsParaviewCollection<> Sflexural(dirname + "/" + "flexural");
gsParaviewCollection<> Smembrane_p(dirname + "/" + "membrane_p");
gsMultiPatch<> deformation = mp;

// Make objects for previous solutions
Expand Down
6 changes: 3 additions & 3 deletions benchmarks/benchmark_Roof_APALM.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -479,7 +479,7 @@ int main (int argc, char** argv)
std::vector<std::string> pointheaders = {"u_x","u_y","u_z"};
std::vector<std::string> otherheaders = {"U-norm","lambda","time","level"};

gsParaviewCollection dataCollection(dirname + "/" + "data");
gsParaviewCollection<> dataCollection(dirname + "/" + "data");
gsStructuralAnalysisOutput<real_t> data(dirname + "/data.csv",refPoints);
if (write)
data.init(pointheaders,otherheaders);
Expand Down Expand Up @@ -548,7 +548,7 @@ int main (int argc, char** argv)
std::vector<std::string> pointheaders = {"u_x","u_y","u_z"};
std::vector<std::string> otherheaders = {"U-norm","lambda","time","level"};

gsParaviewCollection dataCollection(dirname + "/" + "data_serial");
gsParaviewCollection<> dataCollection(dirname + "/" + "data_serial");
gsStructuralAnalysisOutput<real_t> data(dirname + "/data_serial.csv",refPoints);
if (write)
data.init(pointheaders,otherheaders);
Expand Down Expand Up @@ -624,7 +624,7 @@ int main (int argc, char** argv)
std::vector<std::string> pointheaders = {"u_x","u_y","u_z"};
std::vector<std::string> otherheaders = {"U-norm","lambda","time","level"};

gsParaviewCollection dataCollection2(dirname + "/" + "data_parallel");
gsParaviewCollection<> dataCollection2(dirname + "/" + "data_parallel");
gsStructuralAnalysisOutput<real_t> data2(dirname + "/data_parallel.csv",refPoints);
if (write)
data2.init(pointheaders,otherheaders);
Expand Down
26 changes: 13 additions & 13 deletions benchmarks/benchmark_Roof_DWR.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,10 @@ void PlotResults( index_t k,
const gsMultiPatch<T> & mp, const gsMultiPatch<T> & mp_def,
bool plot, bool stress, bool write, bool mesh, bool deformed,
const std::string dirname, const std::string output,
gsParaviewCollection & collection,
gsParaviewCollection & Smembrane,
gsParaviewCollection & Sflexural,
gsParaviewCollection & Smembrane_p);
gsParaviewCollection<> & collection,
gsParaviewCollection<> & Smembrane,
gsParaviewCollection<> & Sflexural,
gsParaviewCollection<> & Smembrane_p);


int main (int argc, char** argv)
Expand Down Expand Up @@ -437,10 +437,10 @@ int main (int argc, char** argv)
assembler->assembleL();
gsVector<> Force = assembler->primalL();

gsParaviewCollection collection(dirname + "/" + output);
gsParaviewCollection Smembrane(dirname + "/" + "membrane");
gsParaviewCollection Sflexural(dirname + "/" + "flexural");
gsParaviewCollection Smembrane_p(dirname + "/" + "membrane_p");
gsParaviewCollection<> collection(dirname + "/" + output);
gsParaviewCollection<> Smembrane(dirname + "/" + "membrane");
gsParaviewCollection<> Sflexural(dirname + "/" + "flexural");
gsParaviewCollection<> Smembrane_p(dirname + "/" + "membrane_p");

// Make objects for previous solutions
real_t Lold = 0, deltaLold = 0;
Expand Down Expand Up @@ -526,7 +526,7 @@ int main (int argc, char** argv)
real_t Umidmin = -30;
index_t k = 0;

gsParaviewCollection errors(dirname + "/" + "errors");
gsParaviewCollection<> errors(dirname + "/" + "errors");
std::vector<real_t> elErrors;
GISMO_ENSURE(refTol >= crsTol,"Refinement tolerance should be bigger than the coarsen tolerance");
while (Umid < Umidmax && Umid > Umidmin && k < maxSteps)
Expand Down Expand Up @@ -869,10 +869,10 @@ void PlotResults( index_t k,
const gsMultiPatch<T> & mp, const gsMultiPatch<T> & mp_def,
bool plot, bool stress, bool /* write */, bool mesh, bool deformed,
const std::string dirname, const std::string output,
gsParaviewCollection & collection,
gsParaviewCollection & Smembrane,
gsParaviewCollection & Sflexural,
gsParaviewCollection & Smembrane_p)
gsParaviewCollection<> & collection,
gsParaviewCollection<> & Smembrane,
gsParaviewCollection<> & Sflexural,
gsParaviewCollection<> & Smembrane_p)
{
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

Expand Down
8 changes: 4 additions & 4 deletions benchmarks/benchmark_TensionWrinkling.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -422,10 +422,10 @@ int main (int argc, char** argv)
arcLength->applyOptions();
arcLength->initialize();

gsParaviewCollection collection(dirname + "/" + output);
gsParaviewCollection Smembrane(dirname + "/" + "membrane");
gsParaviewCollection Sflexural(dirname + "/" + "flexural");
gsParaviewCollection Smembrane_p(dirname + "/" + "membrane_p");
gsParaviewCollection<> collection(dirname + "/" + output);
gsParaviewCollection<> Smembrane(dirname + "/" + "membrane");
gsParaviewCollection<> Sflexural(dirname + "/" + "flexural");
gsParaviewCollection<> Smembrane_p(dirname + "/" + "membrane_p");
gsMultiPatch<> deformation = mp;

// Make objects for previous solutions
Expand Down
8 changes: 4 additions & 4 deletions benchmarks/benchmark_UniaxialTension.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -311,10 +311,10 @@ int main (int argc, char** argv)
arcLength->initialize();


gsParaviewCollection collection(dirname + "/" + output);
gsParaviewCollection Smembrane(dirname + "/" + "membrane");
gsParaviewCollection Sflexural(dirname + "/" + "flexural");
gsParaviewCollection Smembrane_p(dirname + "/" + "membrane_p");
gsParaviewCollection<> collection(dirname + "/" + output);
gsParaviewCollection<> Smembrane(dirname + "/" + "membrane");
gsParaviewCollection<> Sflexural(dirname + "/" + "flexural");
gsParaviewCollection<> Smembrane_p(dirname + "/" + "membrane_p");
gsMultiPatch<> deformation = mp;

// Make objects for previous solutions
Expand Down
6 changes: 3 additions & 3 deletions benchmarks/benchmark_Wrinkling.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -803,7 +803,7 @@ int main (int argc, char** argv)
gsInfo<<"Plotting in Paraview...\n";
gsMatrix<> modeShape;
std::string output = "modes";
gsParaviewCollection mode_collection(dirname + "/" + output);
gsParaviewCollection<> mode_collection(dirname + "/" + output);

int N = nmodes;
// N = vectors.cols();
Expand Down Expand Up @@ -914,8 +914,8 @@ int main (int argc, char** argv)
arcLength->applyOptions();
arcLength->initialize();

gsParaviewCollection collection(dirname + "/" + output);
gsParaviewCollection TensionFields(dirname + "/" + "tensionfield");
gsParaviewCollection<> collection(dirname + "/" + output);
gsParaviewCollection<> TensionFields(dirname + "/" + "tensionfield");
gsMultiPatch<> deformation = mp;

// Make objects for previous solutions
Expand Down
26 changes: 13 additions & 13 deletions benchmarks/benchmark_Wrinkling_DWR.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,10 @@ void PlotResults( index_t k,
const gsMultiPatch<T> & mp, const gsMultiPatch<T> & mp_def,
bool plot, bool stress, bool write, bool mesh, bool deformed,
const std::string dirname, const std::string output,
gsParaviewCollection & collection,
gsParaviewCollection & Smembrane,
gsParaviewCollection & Sflexural,
gsParaviewCollection & Smembrane_p);
gsParaviewCollection<> & collection,
gsParaviewCollection<> & Smembrane,
gsParaviewCollection<> & Sflexural,
gsParaviewCollection<> & Smembrane_p);

int main (int argc, char** argv)
{
Expand Down Expand Up @@ -458,11 +458,11 @@ int main (int argc, char** argv)
return status == ThinShellAssemblerStatus::Success;
};

gsParaviewCollection collection(dirname + "/" + output);
gsParaviewCollection Smembrane(dirname + "/" + "membrane");
gsParaviewCollection Sflexural(dirname + "/" + "flexural");
gsParaviewCollection Smembrane_p(dirname + "/" + "membrane_p");
gsParaviewCollection errors(dirname + "/" + "errors");
gsParaviewCollection<> collection(dirname + "/" + output);
gsParaviewCollection<> Smembrane(dirname + "/" + "membrane");
gsParaviewCollection<> Sflexural(dirname + "/" + "flexural");
gsParaviewCollection<> Smembrane_p(dirname + "/" + "membrane_p");
gsParaviewCollection<> errors(dirname + "/" + "errors");
std::vector<real_t> elErrors;

// Make objects for previous solutions
Expand Down Expand Up @@ -1204,10 +1204,10 @@ void PlotResults( index_t k,
const gsMultiPatch<T> & mp, const gsMultiPatch<T> & mp_def,
bool plot, bool stress, bool /* write */, bool mesh, bool deformed,
const std::string dirname, const std::string output,
gsParaviewCollection & collection,
gsParaviewCollection & Smembrane,
gsParaviewCollection & Sflexural,
gsParaviewCollection & Smembrane_p)
gsParaviewCollection<> & collection,
gsParaviewCollection<> & Smembrane,
gsParaviewCollection<> & Sflexural,
gsParaviewCollection<> & Smembrane_p)
{
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

Expand Down
4 changes: 2 additions & 2 deletions benchmarks/benchmark_cylinder_DC.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -300,8 +300,8 @@ int main (int argc, char** argv)

};

gsParaviewCollection collection(dirname + "/" + output);
gsParaviewCollection collectionTF(dirname + "/" + "tensionfield");
gsParaviewCollection<> collection(dirname + "/" + output);
gsParaviewCollection<> collectionTF(dirname + "/" + "tensionfield");
gsMultiPatch<> deformation = mp;

// Define solvers
Expand Down
2 changes: 1 addition & 1 deletion examples/ShellPostProcess.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ int main(int argc, char *argv[])

gsInfo<<"Writing...\n";

gsParaviewCollection collection(path + output);
gsParaviewCollection<> collection(path + output);

k = 0;

Expand Down
4 changes: 2 additions & 2 deletions examples/example_DynamicBeamNL.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -240,8 +240,8 @@ gsFileManager::mkdir(dirname);

std::string wn = dirname + "/output.csv";

gsParaviewCollection collection("DynamicBeamResults/solution");
gsParaviewCollection collection_an("DynamicBeamResults/analytical");
gsParaviewCollection<> collection("DynamicBeamResults/solution");
gsParaviewCollection<> collection_an("DynamicBeamResults/analytical");

// Function for the Jacobian
gsStructuralAnalysisOps<real_t>::Jacobian_t Jacobian = [&assembler,&mp_def](gsMatrix<real_t> const &x, gsSparseMatrix<real_t> & m)
Expand Down
2 changes: 1 addition & 1 deletion examples/example_DynamicShell.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ int main (int argc, char** argv)
//------------------------------------------------------------------------------
// Nonlinear time integration
//------------------------------------------------------------------------------
gsParaviewCollection collection(dirname + "/solution");
gsParaviewCollection<> collection(dirname + "/solution");

// Compute mass matrix (since it is constant over time)
assembler->assembleMass();
Expand Down
Loading
Loading