Skip to content
Snippets Groups Projects
Commit 8c5913b6 authored by Matti Pellika's avatar Matti Pellika
Browse files 

Bugfixes around the place.
parent e884dfcd
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Geo/CellComplex.cpp
+ 4
− 2
View file @ 8c5913b6
...@@ -421,14 +421,16 @@ int CellComplex::coreduceComplex(bool omitLowdim){ ...@@ -421,14 +421,16 @@ int CellComplex::coreduceComplex(bool omitLowdim){
int count = 0; int count = 0;
removeSubdomain(); CellComplex::removeSubdomain();
for(int dim = 0; dim < 4; dim++){ for(int dim = 0; dim < 4; dim++){
citer cit = firstCell(dim); citer cit = firstCell(dim);
if(cit != lastCell(dim)){ while(cit != lastCell(dim)){
Cell* cell = *cit; Cell* cell = *cit;
count = count + coreduction(cell); count = count + coreduction(cell);
if(count != 0) break;
cit++;
} }
} }
......
Geo/Homology.cpp
+ 21
− 11
View file @ 8c5913b6
...@@ -86,7 +86,9 @@ void Homology::findGenerators(std::string fileName){ ...@@ -86,7 +86,9 @@ void Homology::findGenerators(std::string fileName){
chains->computeHomology(); chains->computeHomology();
Msg::Info("Homology Computation complete."); Msg::Info("Homology Computation complete.");
int HRank[4];
for(int j = 0; j < 4; j++){ for(int j = 0; j < 4; j++){
HRank[j] = 0;
for(int i = 1; i <= chains->getBasisSize(j); i++){ for(int i = 1; i <= chains->getBasisSize(j); i++){
std::string generator; std::string generator;
...@@ -97,16 +99,17 @@ void Homology::findGenerators(std::string fileName){ ...@@ -97,16 +99,17 @@ void Homology::findGenerators(std::string fileName){
std::string name = dimension + "D Generator " + generator; std::string name = dimension + "D Generator " + generator;
Chain* chain = new Chain(_cellComplex->getCells(j), chains->getCoeffVector(j,i), _cellComplex, name); Chain* chain = new Chain(_cellComplex->getCells(j), chains->getCoeffVector(j,i), _cellComplex, name);
chain->writeChainMSH(fileName); chain->writeChainMSH(fileName);
if(chain->getSize() != 0) HRank[j] = HRank[j] + 1;
delete chain; delete chain;
} }
} }
Msg::Info("Ranks of homology groups for primal cell complex:"); Msg::Info("Ranks of homology groups for primal cell complex:");
Msg::Info("H0 = %d", chains->getBasisSize(0)); Msg::Info("H0 = %d", HRank[0]);
Msg::Info("H1 = %d", chains->getBasisSize(1)); Msg::Info("H1 = %d", HRank[1]);
Msg::Info("H2 = %d", chains->getBasisSize(2)); Msg::Info("H2 = %d", HRank[2]);
Msg::Info("H3 = %d", chains->getBasisSize(3)); Msg::Info("H3 = %d", HRank[3]);
if(omitted != 0) Msg::Info("%d 0D generators are not shown completely.", omitted); if(omitted != 0) Msg::Info("Computation of %dD generators was omitted.", _cellComplex->getDim());
Msg::Info("Wrote results to %s.", fileName.c_str()); Msg::Info("Wrote results to %s.", fileName.c_str());
...@@ -118,6 +121,8 @@ void Homology::findGenerators(std::string fileName){ ...@@ -118,6 +121,8 @@ void Homology::findGenerators(std::string fileName){
void Homology::findThickCuts(std::string fileName){ void Homology::findThickCuts(std::string fileName){
_cellComplex->removeSubdomain();
Msg::Info("Reducing Cell Complex..."); Msg::Info("Reducing Cell Complex...");
int omitted = _cellComplex->coreduceComplex(true); int omitted = _cellComplex->coreduceComplex(true);
_cellComplex->cocombine(0); _cellComplex->cocombine(0);
...@@ -135,28 +140,33 @@ void Homology::findThickCuts(std::string fileName){ ...@@ -135,28 +140,33 @@ void Homology::findThickCuts(std::string fileName){
chains->computeHomology(true); chains->computeHomology(true);
Msg::Info("Homology Computation complete."); Msg::Info("Homology Computation complete.");
int dim = _cellComplex->getDim();
int HRank[4];
for(int j = 3; j > -1; j--){ for(int j = 3; j > -1; j--){
HRank[j] = 0;
for(int i = 1; i <= chains->getBasisSize(j); i++){ for(int i = 1; i <= chains->getBasisSize(j); i++){
std::string generator; std::string generator;
std::string dimension; std::string dimension;
convert(i, generator); convert(i, generator);
convert(3-j, dimension); convert(dim-j, dimension);
std::string name = dimension + "D Thick cut " + generator; std::string name = dimension + "D Thick cut " + generator;
Chain* chain = new Chain(_cellComplex->getCells(j), chains->getCoeffVector(j,i), _cellComplex, name); Chain* chain = new Chain(_cellComplex->getCells(j), chains->getCoeffVector(j,i), _cellComplex, name);
chain->writeChainMSH(fileName); chain->writeChainMSH(fileName);
if(chain->getSize() != 0) HRank[j] = HRank[j] + 1;
delete chain; delete chain;
} }
} }
Msg::Info("Ranks of homology groups for dual cell complex:"); Msg::Info("Ranks of homology groups for dual cell complex:");
Msg::Info("H0 = %d", chains->getBasisSize(3)); Msg::Info("H0 = %d", HRank[0]);
Msg::Info("H1 = %d", chains->getBasisSize(2)); Msg::Info("H1 = %d", HRank[1]);
Msg::Info("H2 = %d", chains->getBasisSize(1)); Msg::Info("H2 = %d", HRank[2]);
Msg::Info("H3 = %d", chains->getBasisSize(0)); Msg::Info("H3 = %d", HRank[3]);
if(omitted != 0) Msg::Info("%d 3D thick cuts are not shown completely.", omitted); if(omitted != 0) Msg::Info("Computation of %dD thick cuts was omitted.", dim);
Msg::Info("Wrote results to %s.", fileName.c_str()); Msg::Info("Wrote results to %s.", fileName.c_str());
......
benchmarks/3d/induction1.geo
+ 1
− 0
View file @ 8c5913b6
...@@ -313,6 +313,7 @@ Physical Surface(1001) = {64,66,68,105,54,58}; //gh0 ...@@ -313,6 +313,7 @@ Physical Surface(1001) = {64,66,68,105,54,58}; //gh0
Physical Surface(700) = {75,1034}; //elec0 Physical Surface(700) = {75,1034}; //elec0
Physical Surface(701) = {79,1032}; //elec1 Physical Surface(701) = {79,1032}; //elec1
Physical Surface(702) = {75,1034,79,1032}; //elec1+2
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment