From d3aa699df1994fdfb5da840af6b793d5ada975a4 Mon Sep 17 00:00:00 2001
From: Oliver Sander <sander@igpm.rwth-aachen.de>
Date: Fri, 22 Aug 2014 19:48:40 +0000
Subject: [PATCH] Output files by the mixed FE code should start with 'mixed-'
[[Imported from SVN: r9860]]
---
dune/gfe/mixedriemanniantrsolver.cc | 2 +-
mixed-cosserat-continuum.cc | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dune/gfe/mixedriemanniantrsolver.cc b/dune/gfe/mixedriemanniantrsolver.cc
index 1fe323d2..05422631 100644
--- a/dune/gfe/mixedriemanniantrsolver.cc
+++ b/dune/gfe/mixedriemanniantrsolver.cc
@@ -610,7 +610,7 @@ void MixedRiemannianTrustRegionSolver<GridType,Basis0,TargetSpace0,Basis1,Target
iAsAscii << i+1;
CosseratVTKWriter<GridType>::template writeMixed<Basis0,Basis1>(assembler_->basis0_,x0_,
assembler_->basis1_,x1_,
- "cosserat_iterate_" + iAsAscii.str());
+ "mixed-cosserat_iterate_" + iAsAscii.str());
if (rank==0)
std::cout << "iteration took " << totalTimer.elapsed() << " sec." << std::endl;
diff --git a/mixed-cosserat-continuum.cc b/mixed-cosserat-continuum.cc
index 8b6a05f3..376cb2be 100644
--- a/mixed-cosserat-continuum.cc
+++ b/mixed-cosserat-continuum.cc
@@ -244,7 +244,7 @@ int main (int argc, char *argv[]) try
GridView gridView = grid->leafGridView();
typedef P2NodalBasis<GridView,double> DeformationFEBasis;
- typedef P2NodalBasis<GridView,double> OrientationFEBasis;
+ typedef P1NodalBasis<GridView,double> OrientationFEBasis;
DeformationFEBasis deformationFEBasis(gridView);
OrientationFEBasis orientationFEBasis(gridView);
@@ -340,7 +340,7 @@ int main (int argc, char *argv[]) try
// Output initial iterate (of homotopy loop)
CosseratVTKWriter<GridType>::writeMixed<DeformationFEBasis,OrientationFEBasis>(deformationFEBasis,xDisp,
orientationFEBasis,xOrient,
- resultPath + "cosserat_homotopy_0");
+ resultPath + "mixed-cosserat_homotopy_0");
for (int i=0; i<numHomotopySteps; i++) {
@@ -461,7 +461,7 @@ int main (int argc, char *argv[]) try
iAsAscii << i+1;
CosseratVTKWriter<GridType>::writeMixed<DeformationFEBasis,OrientationFEBasis>(deformationFEBasis,xDisp,
orientationFEBasis,xOrient,
- resultPath + "cosserat_homotopy_" + iAsAscii.str());
+ resultPath + "mixed-cosserat_homotopy_" + iAsAscii.str());
}
--
GitLab