diff --git a/Mesh/meshGFace.cpp b/Mesh/meshGFace.cpp index 3047a51c862d3373d688adf4a3f465b2e471882f..c13e515fe9d63bbae3e9667253fa017f018b6e09 100644 --- a/Mesh/meshGFace.cpp +++ b/Mesh/meshGFace.cpp @@ -828,7 +828,7 @@ static bool meshGenerator(GFace *gf, int RECUR_ITER, &recoverMapInv); optimizeMeshBDS(gf, *m, 2); refineMeshBDS(gf, *m, CTX::instance()->mesh.refineSteps, false, - &recoverMapInv); + &recoverMapInv); optimizeMeshBDS(gf, *m, 2); } computeMeshSizeFieldAccuracy(gf, *m, gf->meshStatistics.efficiency_index, diff --git a/Solver/linearSystemPETSc.hpp b/Solver/linearSystemPETSc.hpp index 99c0ad0021b05416304cb5af6dfb902f05972d3c..73af243fa2a0ec4ad48448977bcc7c7e34d6ae6a 100644 --- a/Solver/linearSystemPETSc.hpp +++ b/Solver/linearSystemPETSc.hpp @@ -263,8 +263,14 @@ std::vector<scalar> linearSystemPETSc<scalar>::getData() MatInfo info; _try(MatGetInfo(_a,MAT_LOCAL,&info)); std::vector<scalar> data; // Maybe I should reserve or resize (SAM) + +#if defined(PETSC_USE_COMPLEX) + for (int i = 0; i < info.nz_allocated; i++) + data.push_back(v[i].real()); +#else for (int i = 0; i < info.nz_allocated; i++) data.push_back(v[i]); +#endif _try(MatRestoreArray(_a,&v)); return data; } diff --git a/benchmarks/step/tank.geo b/benchmarks/step/tank.geo index 513a3baaaccc576acb1d43f3314028b0c603678e..0b74338cc45cbfcd4de5bbc1e4ae495b7beac852 100644 --- a/benchmarks/step/tank.geo +++ b/benchmarks/step/tank.geo @@ -3,7 +3,7 @@ Geometry.OCCFixSmallFaces = 1; Merge "tank.brep"; -n = 2; +n = 1; Transfinite Line {55, 56, 13, 12, 36, 32, 95, 94, 97, 105, 80, 61, 64, 78, 50, 48} = 5*n; // indep. diff --git a/tutorial/t1.geo b/tutorial/t1.geo index 4e6ea1526cf426d023107b1c7cce15cba62447a3..e2f947936faebc87183d39a4f37a51ccd659efb4 100644 --- a/tutorial/t1.geo +++ b/tutorial/t1.geo @@ -10,7 +10,7 @@ // The simplest construction in Gmsh's scripting language is the // `affectation'. The following command defines a new variable `lc': -lc = 0.009; +lc = 0.04; // This variable can then be used in the definition of Gmsh's simplest // `elementary entity', a `Point'. A Point is defined by a list of diff --git a/utils/api_demos/mainSimple.cpp b/utils/api_demos/mainSimple.cpp index 806daa8b4f2c51ca8a59a1a7bd4e7aa4effa3075..34d02104c4359b2ea71dcb698f8ea41be79eb4eb 100644 --- a/utils/api_demos/mainSimple.cpp +++ b/utils/api_demos/mainSimple.cpp @@ -6,7 +6,7 @@ int main(int argc, char **argv) { GmshInitialize(argc, argv); - //GmshSetOption("Mesh", "Algorithm", 5); + GmshSetOption("Mesh", "Algorithm", 5.); GModel *m = new GModel(); m->readGEO("../../tutorial/t5.geo"); //GmshMergeFile("../../tutorial/t5.geo"); // will also set the bbox