diff --git a/benchmarks/benchmark_Balloon.cpp b/benchmarks/benchmark_Balloon.cpp index 24c3565..5615c04 100644 --- a/benchmarks/benchmark_Balloon.cpp +++ b/benchmarks/benchmark_Balloon.cpp @@ -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 diff --git a/benchmarks/benchmark_Beam.cpp b/benchmarks/benchmark_Beam.cpp index f380183..b2dad62 100644 --- a/benchmarks/benchmark_Beam.cpp +++ b/benchmarks/benchmark_Beam.cpp @@ -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 diff --git a/benchmarks/benchmark_Beam_APALM.cpp b/benchmarks/benchmark_Beam_APALM.cpp index 4d98dd7..76b0c9e 100644 --- a/benchmarks/benchmark_Beam_APALM.cpp +++ b/benchmarks/benchmark_Beam_APALM.cpp @@ -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 data(dirname + "/data_branch"+std::to_string(b)+".csv",refPoints); if (write) data.init(pointheaders,otherheaders); @@ -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 data(dirname + "/data_serial_branch"+std::to_string(b)+".csv",refPoints); if (write) data.init(pointheaders,otherheaders); @@ -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 data(dirname + "/data_parallel_branch"+std::to_string(b)+".csv",refPoints); if (write) data.init(pointheaders,otherheaders); diff --git a/benchmarks/benchmark_Cylinder.cpp b/benchmarks/benchmark_Cylinder.cpp index 3b2f768..65eac48 100644 --- a/benchmarks/benchmark_Cylinder.cpp +++ b/benchmarks/benchmark_Cylinder.cpp @@ -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 diff --git a/benchmarks/benchmark_Elasticity_Beam_APALM.cpp b/benchmarks/benchmark_Elasticity_Beam_APALM.cpp index 1e3983d..6cba07f 100644 --- a/benchmarks/benchmark_Elasticity_Beam_APALM.cpp +++ b/benchmarks/benchmark_Elasticity_Beam_APALM.cpp @@ -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 data(dirname + "/data_serial_branch"+std::to_string(b)+".csv",refPoints); if (write) data.init(pointheaders,otherheaders); @@ -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 data(dirname + "/data_parallel_branch"+std::to_string(b)+".csv",refPoints); if (write) data.init(pointheaders,otherheaders); diff --git a/benchmarks/benchmark_FrustrumALM.cpp b/benchmarks/benchmark_FrustrumALM.cpp index 548aef8..74c987e 100644 --- a/benchmarks/benchmark_FrustrumALM.cpp +++ b/benchmarks/benchmark_FrustrumALM.cpp @@ -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; diff --git a/benchmarks/benchmark_FrustrumDC.cpp b/benchmarks/benchmark_FrustrumDC.cpp index 638d4b2..43737d6 100644 --- a/benchmarks/benchmark_FrustrumDC.cpp +++ b/benchmarks/benchmark_FrustrumDC.cpp @@ -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; diff --git a/benchmarks/benchmark_Frustrum_APALM.cpp b/benchmarks/benchmark_Frustrum_APALM.cpp index 35608f3..cbbb063 100644 --- a/benchmarks/benchmark_Frustrum_APALM.cpp +++ b/benchmarks/benchmark_Frustrum_APALM.cpp @@ -532,7 +532,7 @@ int main (int argc, char** argv) std::vector pointheaders = {"u_x","u_y","u_z"}; std::vector otherheaders = {"lambda","level"}; - gsParaviewCollection dataCollection(dirname + "/" + "data"); + gsParaviewCollection<> dataCollection(dirname + "/" + "data"); gsStructuralAnalysisOutput data(dirname + "/data.csv",refPoints); if (write) data.init(pointheaders,otherheaders); @@ -616,7 +616,7 @@ int main (int argc, char** argv) std::vector pointheaders = {"u_x","u_y","u_z"}; std::vector otherheaders = {"lambda","level"}; - gsParaviewCollection dataCollection(dirname + "/" + "data_serial"); + gsParaviewCollection<> dataCollection(dirname + "/" + "data_serial"); gsStructuralAnalysisOutput data(dirname + "/data_serial.csv",refPoints); if (write) data.init(pointheaders,otherheaders); @@ -684,7 +684,7 @@ int main (int argc, char** argv) std::vector pointheaders = {"u_x","u_y","u_z"}; std::vector otherheaders = {"lambda","level"}; - gsParaviewCollection dataCollection2(dirname + "/" + "data_parallel"); + gsParaviewCollection<> dataCollection2(dirname + "/" + "data_parallel"); gsStructuralAnalysisOutput data2(dirname + "/data_parallel.csv",refPoints); if (write) data2.init(pointheaders,otherheaders); diff --git a/benchmarks/benchmark_MaterialTest.cpp b/benchmarks/benchmark_MaterialTest.cpp index 4d57f85..7a69647 100644 --- a/benchmarks/benchmark_MaterialTest.cpp +++ b/benchmarks/benchmark_MaterialTest.cpp @@ -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; diff --git a/benchmarks/benchmark_Pillow.cpp b/benchmarks/benchmark_Pillow.cpp index 2983916..aadeccb 100644 --- a/benchmarks/benchmark_Pillow.cpp +++ b/benchmarks/benchmark_Pillow.cpp @@ -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 writer(dirname + "/" + wn,writePoints); std::vector pointheaders = {"x","y","z"}; diff --git a/benchmarks/benchmark_Roof.cpp b/benchmarks/benchmark_Roof.cpp index 85aadea..8391028 100644 --- a/benchmarks/benchmark_Roof.cpp +++ b/benchmarks/benchmark_Roof.cpp @@ -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 diff --git a/benchmarks/benchmark_Roof_APALM.cpp b/benchmarks/benchmark_Roof_APALM.cpp index d74bc12..e483523 100644 --- a/benchmarks/benchmark_Roof_APALM.cpp +++ b/benchmarks/benchmark_Roof_APALM.cpp @@ -479,7 +479,7 @@ int main (int argc, char** argv) std::vector pointheaders = {"u_x","u_y","u_z"}; std::vector otherheaders = {"U-norm","lambda","time","level"}; - gsParaviewCollection dataCollection(dirname + "/" + "data"); + gsParaviewCollection<> dataCollection(dirname + "/" + "data"); gsStructuralAnalysisOutput data(dirname + "/data.csv",refPoints); if (write) data.init(pointheaders,otherheaders); @@ -548,7 +548,7 @@ int main (int argc, char** argv) std::vector pointheaders = {"u_x","u_y","u_z"}; std::vector otherheaders = {"U-norm","lambda","time","level"}; - gsParaviewCollection dataCollection(dirname + "/" + "data_serial"); + gsParaviewCollection<> dataCollection(dirname + "/" + "data_serial"); gsStructuralAnalysisOutput data(dirname + "/data_serial.csv",refPoints); if (write) data.init(pointheaders,otherheaders); @@ -624,7 +624,7 @@ int main (int argc, char** argv) std::vector pointheaders = {"u_x","u_y","u_z"}; std::vector otherheaders = {"U-norm","lambda","time","level"}; - gsParaviewCollection dataCollection2(dirname + "/" + "data_parallel"); + gsParaviewCollection<> dataCollection2(dirname + "/" + "data_parallel"); gsStructuralAnalysisOutput data2(dirname + "/data_parallel.csv",refPoints); if (write) data2.init(pointheaders,otherheaders); diff --git a/benchmarks/benchmark_Roof_DWR.cpp b/benchmarks/benchmark_Roof_DWR.cpp index 9e0995a..7b18a15 100644 --- a/benchmarks/benchmark_Roof_DWR.cpp +++ b/benchmarks/benchmark_Roof_DWR.cpp @@ -51,10 +51,10 @@ void PlotResults( index_t k, const gsMultiPatch & mp, const gsMultiPatch & 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) @@ -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; @@ -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 elErrors; GISMO_ENSURE(refTol >= crsTol,"Refinement tolerance should be bigger than the coarsen tolerance"); while (Umid < Umidmax && Umid > Umidmin && k < maxSteps) @@ -869,10 +869,10 @@ void PlotResults( index_t k, const gsMultiPatch & mp, const gsMultiPatch & 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) { ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/benchmarks/benchmark_TensionWrinkling.cpp b/benchmarks/benchmark_TensionWrinkling.cpp index ab68e53..776e0ad 100644 --- a/benchmarks/benchmark_TensionWrinkling.cpp +++ b/benchmarks/benchmark_TensionWrinkling.cpp @@ -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 diff --git a/benchmarks/benchmark_UniaxialTension.cpp b/benchmarks/benchmark_UniaxialTension.cpp index 98d16dc..eb203af 100644 --- a/benchmarks/benchmark_UniaxialTension.cpp +++ b/benchmarks/benchmark_UniaxialTension.cpp @@ -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 diff --git a/benchmarks/benchmark_Wrinkling.cpp b/benchmarks/benchmark_Wrinkling.cpp index 1193e93..02f6f85 100644 --- a/benchmarks/benchmark_Wrinkling.cpp +++ b/benchmarks/benchmark_Wrinkling.cpp @@ -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(); @@ -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 diff --git a/benchmarks/benchmark_Wrinkling_DWR.cpp b/benchmarks/benchmark_Wrinkling_DWR.cpp index fb6f4e5..f21780b 100644 --- a/benchmarks/benchmark_Wrinkling_DWR.cpp +++ b/benchmarks/benchmark_Wrinkling_DWR.cpp @@ -49,10 +49,10 @@ void PlotResults( index_t k, const gsMultiPatch & mp, const gsMultiPatch & 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) { @@ -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 elErrors; // Make objects for previous solutions @@ -1204,10 +1204,10 @@ void PlotResults( index_t k, const gsMultiPatch & mp, const gsMultiPatch & 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) { ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/benchmarks/benchmark_cylinder_DC.cpp b/benchmarks/benchmark_cylinder_DC.cpp index 808e97f..187cbd7 100644 --- a/benchmarks/benchmark_cylinder_DC.cpp +++ b/benchmarks/benchmark_cylinder_DC.cpp @@ -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 diff --git a/examples/ShellPostProcess.cpp b/examples/ShellPostProcess.cpp index 9fbd3d0..6a0e87c 100644 --- a/examples/ShellPostProcess.cpp +++ b/examples/ShellPostProcess.cpp @@ -113,7 +113,7 @@ int main(int argc, char *argv[]) gsInfo<<"Writing...\n"; - gsParaviewCollection collection(path + output); + gsParaviewCollection<> collection(path + output); k = 0; diff --git a/examples/example_DynamicBeamNL.cpp b/examples/example_DynamicBeamNL.cpp index d2231f4..c54ec2c 100644 --- a/examples/example_DynamicBeamNL.cpp +++ b/examples/example_DynamicBeamNL.cpp @@ -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::Jacobian_t Jacobian = [&assembler,&mp_def](gsMatrix const &x, gsSparseMatrix & m) diff --git a/examples/example_DynamicShell.cpp b/examples/example_DynamicShell.cpp index 6e0057c..99b88ad 100644 --- a/examples/example_DynamicShell.cpp +++ b/examples/example_DynamicShell.cpp @@ -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(); diff --git a/examples/example_DynamicShellNL.cpp b/examples/example_DynamicShellNL.cpp index a02e2ec..f0f0d76 100644 --- a/examples/example_DynamicShellNL.cpp +++ b/examples/example_DynamicShellNL.cpp @@ -211,7 +211,7 @@ int main (int argc, char** argv) //------------------------------------------------------------------------------ // Nonlinear time integration //------------------------------------------------------------------------------ -gsParaviewCollection collection(dirname + "/solution"); +gsParaviewCollection<> collection(dirname + "/solution"); // Function for the Jacobian gsStructuralAnalysisOps::Jacobian_t Jacobian = [&assembler,&mp_def](gsMatrix const &x, gsSparseMatrix & m) diff --git a/examples/example_DynamicShell_XBraid.cpp b/examples/example_DynamicShell_XBraid.cpp index bcfe87b..7a416bd 100644 --- a/examples/example_DynamicShell_XBraid.cpp +++ b/examples/example_DynamicShell_XBraid.cpp @@ -251,7 +251,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(); diff --git a/examples/example_PinchedMembrane_DWR.cpp b/examples/example_PinchedMembrane_DWR.cpp index d24ce21..fe0282e 100644 --- a/examples/example_PinchedMembrane_DWR.cpp +++ b/examples/example_PinchedMembrane_DWR.cpp @@ -288,8 +288,8 @@ int main(int argc, char *argv[]) gsFileManager::mkdir(dirname); - gsParaviewCollection collection(dirname + "/" + "solution"); - gsParaviewCollection errors(dirname + "/" + "error_elem_ref"); + gsParaviewCollection<> collection(dirname + "/" + "solution"); + gsParaviewCollection<> errors(dirname + "/" + "error_elem_ref"); std::vector elErrors; diff --git a/examples/example_ShearWrinkling.cpp b/examples/example_ShearWrinkling.cpp index d95c17f..fbebf17 100644 --- a/examples/example_ShearWrinkling.cpp +++ b/examples/example_ShearWrinkling.cpp @@ -373,7 +373,7 @@ int main (int argc, char** argv) gsControlDisplacement controlDC(&solver); - gsParaviewCollection collection(dirname + "/" + output); + gsParaviewCollection<> collection(dirname + "/" + output); gsMultiPatch<> deformation = mp; gsMatrix<> solVector; diff --git a/examples/gsElasticity_Modal.cpp b/examples/gsElasticity_Modal.cpp index d693305..a381f0c 100644 --- a/examples/gsElasticity_Modal.cpp +++ b/examples/gsElasticity_Modal.cpp @@ -226,7 +226,7 @@ int main (int argc, char** argv) gsFileManager::mkdir("ModalResults"); gsMatrix<> modeShape; gsMultiPatch<> displacement; - gsParaviewCollection collection("ModalResults/modes_solid"); + gsParaviewCollection<> collection("ModalResults/modes_solid"); int N = 1; if (!first) diff --git a/examples/gsThinShell_ArcLength.cpp b/examples/gsThinShell_ArcLength.cpp index c5490f3..83e81e6 100644 --- a/examples/gsThinShell_ArcLength.cpp +++ b/examples/gsThinShell_ArcLength.cpp @@ -1052,10 +1052,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 diff --git a/examples/gsThinShell_Modal.cpp b/examples/gsThinShell_Modal.cpp index 62c252f..526c64a 100644 --- a/examples/gsThinShell_Modal.cpp +++ b/examples/gsThinShell_Modal.cpp @@ -546,7 +546,7 @@ int main (int argc, char** argv) gsMultiPatch<> deformation = solution; gsMatrix<> modeShape; - gsParaviewCollection collection("ModalResults/modes"); + gsParaviewCollection<> collection("ModalResults/modes"); int N = 1; if (!first) diff --git a/examples/snapping_element.cpp b/examples/snapping_element.cpp index 12454ca..a9235ad 100644 --- a/examples/snapping_element.cpp +++ b/examples/snapping_element.cpp @@ -298,7 +298,7 @@ int main(int argc, char *argv[]) writePoints.col(0)< collection(dirname + "/" + output); deformation = mp; // Make objects for previous solutions diff --git a/examples/snapping_element3D.cpp b/examples/snapping_element3D.cpp index 54d345e..f5fb0cf 100644 --- a/examples/snapping_element3D.cpp +++ b/examples/snapping_element3D.cpp @@ -319,7 +319,7 @@ else writePoints.col(0)< collection(dirname + "/" + output); deformation = mp; // Make objects for previous solutions diff --git a/examples/snapping_element_shell.cpp b/examples/snapping_element_shell.cpp index 8bb7e69..c9e2130 100644 --- a/examples/snapping_element_shell.cpp +++ b/examples/snapping_element_shell.cpp @@ -310,7 +310,7 @@ int main(int argc, char *argv[]) writePoints.col(0)< collection(dirname + "/" + output); deformation = mp; // Make objects for previous solutions diff --git a/examples/snapping_example.cpp b/examples/snapping_example.cpp index 811d24d..d4fa665 100644 --- a/examples/snapping_example.cpp +++ b/examples/snapping_example.cpp @@ -386,7 +386,7 @@ else std::string dirname = "ArcLengthResults/snapping_2D_al=" + std::to_string(al); - gsParaviewCollection collection(dirname + "/" + output); + gsParaviewCollection<> collection(dirname + "/" + output); deformation = mp; // Make objects for previous solutions diff --git a/examples/snapping_example3D.cpp b/examples/snapping_example3D.cpp index ffd820a..f46ca1d 100644 --- a/examples/snapping_example3D.cpp +++ b/examples/snapping_example3D.cpp @@ -396,7 +396,7 @@ else std::string dirname = "ArcLengthResults/snapping_3D_al=" + std::to_string(al); - gsParaviewCollection collection(dirname + "/" + output); + gsParaviewCollection<> collection(dirname + "/" + output); deformation = mp; // Make objects for previous solutions diff --git a/examples/snapping_example_shell.cpp b/examples/snapping_example_shell.cpp index 120065e..063fe3a 100644 --- a/examples/snapping_example_shell.cpp +++ b/examples/snapping_example_shell.cpp @@ -430,7 +430,7 @@ int main(int argc, char *argv[]) GISMO_ENSURE(gsFileManager::mkdir(dirname),"Failed to create directory " + dirname); // Made directory - gsParaviewCollection collection(dirname + "/" + output); + gsParaviewCollection<> collection(dirname + "/" + output); deformation = mp; // Make objects for previous solutions diff --git a/examples/snapping_example_shell_APALM.cpp b/examples/snapping_example_shell_APALM.cpp index e7a83c1..701874c 100644 --- a/examples/snapping_example_shell_APALM.cpp +++ b/examples/snapping_example_shell_APALM.cpp @@ -528,7 +528,7 @@ int main(int argc, char *argv[]) dirname = gsFileManager::getCurrentPath() + dirname; GISMO_ENSURE(gsFileManager::mkdir(dirname),"Failed to create directory " + dirname); // Made directory - gsParaviewCollection collection(dirname + "/" + output); + gsParaviewCollection<> collection(dirname + "/" + output); gsAPALMSnapping apalm(comm,arcLength,apalmData,&assembler,dirname,writePoints,writePatches,Nx,Ny,l,h,b); apalm.options().setSwitch("Verbose",(verbose>0)); diff --git a/examples/snapping_example_shell_DC.cpp b/examples/snapping_example_shell_DC.cpp index 3513c9d..caebe7d 100644 --- a/examples/snapping_example_shell_DC.cpp +++ b/examples/snapping_example_shell_DC.cpp @@ -396,7 +396,7 @@ int main(int argc, char *argv[]) GISMO_ENSURE(gsFileManager::mkdir(dirname),"Failed to create directory " + dirname); // Made directory - gsParaviewCollection collection(dirname + "/" + output); + gsParaviewCollection<> collection(dirname + "/" + output); deformation = mp; if (write) diff --git a/solvers/buckling_shell_XML.cpp b/solvers/buckling_shell_XML.cpp index cfe5366..73a1d46 100644 --- a/solvers/buckling_shell_XML.cpp +++ b/solvers/buckling_shell_XML.cpp @@ -257,7 +257,7 @@ int main (int argc, char** argv) gsInfo<<"Plotting in Paraview...\n"; gsMultiPatch<> deformation = mp; gsMatrix<> modeShape; - gsParaviewCollection collection(dirname + sep + output); + gsParaviewCollection<> collection(dirname + sep + output); index_t N = nmodes; for (index_t m=0; m modeShape; - gsParaviewCollection collection(dirname + sep + "modes"); + gsParaviewCollection<> collection(dirname + sep + "modes"); int N = 1; // if (!first) diff --git a/solvers/modal_shell_XML.cpp b/solvers/modal_shell_XML.cpp index df4a6b5..f2c1ad3 100644 --- a/solvers/modal_shell_XML.cpp +++ b/solvers/modal_shell_XML.cpp @@ -262,7 +262,7 @@ int main (int argc, char** argv) gsInfo<<"Plotting in Paraview...\n"; gsMultiPatch<> deformation = mp; gsMatrix<> modeShape; - gsParaviewCollection collection(dirname + sep + output); + gsParaviewCollection<> collection(dirname + sep + output); index_t N = nmodes; for (index_t m=0; m modeShape; - gsParaviewCollection collection(dirname + sep + "modes"); + gsParaviewCollection<> collection(dirname + sep + "modes"); int N = 1; // if (!first) diff --git a/solvers/quasistatic_shell_XML.cpp b/solvers/quasistatic_shell_XML.cpp index 634ab10..55057bf 100644 --- a/solvers/quasistatic_shell_XML.cpp +++ b/solvers/quasistatic_shell_XML.cpp @@ -273,8 +273,8 @@ int main (int argc, char** argv) arcLength->applyOptions(); arcLength->initialize(); - gsParaviewCollection collection(dirname + sep + output); - gsParaviewCollection TensionFields(dirname + sep + "tensionfield"); + gsParaviewCollection<> collection(dirname + sep + output); + gsParaviewCollection<> TensionFields(dirname + sep + "tensionfield"); gsMultiPatch<> deformation = mp; // Make objects for previous solutions diff --git a/solvers/quasistatic_shell_multipatch_XML.cpp b/solvers/quasistatic_shell_multipatch_XML.cpp index 35fd985..1b40575 100644 --- a/solvers/quasistatic_shell_multipatch_XML.cpp +++ b/solvers/quasistatic_shell_multipatch_XML.cpp @@ -403,8 +403,8 @@ int main (int argc, char** argv) arcLength->applyOptions(); arcLength->initialize(); - gsParaviewCollection collection(dirname + sep + output); - gsParaviewCollection TensionFields(dirname + sep + "tensionfield"); + gsParaviewCollection<> collection(dirname + sep + output); + gsParaviewCollection<> TensionFields(dirname + sep + "tensionfield"); gsMultiPatch<> deformation = mp; // Make objects for previous solutions diff --git a/tutorials/nonlinear_shell_arcLength.cpp b/tutorials/nonlinear_shell_arcLength.cpp index 9764eab..b368fac 100644 --- a/tutorials/nonlinear_shell_arcLength.cpp +++ b/tutorials/nonlinear_shell_arcLength.cpp @@ -153,7 +153,7 @@ int main(int argc, char *argv[]) //! [Solve nonlinear problem] index_t step = 50; - gsParaviewCollection collection("Deformation"); + gsParaviewCollection<> collection("Deformation"); gsVector<> solVector; gsMultiPatch<> displ, def; for (index_t k=0; k collection("Deformation"); gsMultiPatch<> displ, def; real_t time = 0; diff --git a/tutorials/nonlinear_solid_arcLength.cpp b/tutorials/nonlinear_solid_arcLength.cpp index 5fc6da9..a2e7995 100644 --- a/tutorials/nonlinear_solid_arcLength.cpp +++ b/tutorials/nonlinear_solid_arcLength.cpp @@ -130,7 +130,7 @@ int main(int argc, char *argv[]) //! [Solve nonlinear problem] index_t step = 50; - gsParaviewCollection collection("Deformation"); + gsParaviewCollection<> collection("Deformation"); gsVector<> solVector; gsMultiPatch<> displ, def; for (index_t k=0; k collection("Deformation"); gsMultiPatch<> displ, def; real_t time = 0;