Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes diffusion to compile against recent morphologica changes #1

Closed
wants to merge 1 commit into from
Closed

Fixes diffusion to compile against recent morphologica changes #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions hexvis.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ int main(int argc, char **argv){
// Create a new HexGridVisual then set its parameters (zScale, colourScale, etc.
// this one is for Fflux.
spatOff = { -0.5f*xzero, 0.0f, 0.0f };
auto hgv1 = std::make_unique<morph::HexGridVisual<FLT>> (D.hg, spatOff);
auto hgv1 = std::make_unique<morph::HexGridVisual<FLT>> (D.hg.get(), spatOff);
v1.bindmodel (hgv1);
hgv1->setScalarData (&D.Fflux);
hgv1->zScale.setParams (ZScaleMin, ZScaleMax);
Expand All @@ -327,7 +327,7 @@ int main(int argc, char **argv){

//temperature visual.
spatOff = { xzero, 0.0f, 0.0f };
auto hgv2 = std::make_unique<morph::HexGridVisual<FLT>> (D.hg, spatOff);
auto hgv2 = std::make_unique<morph::HexGridVisual<FLT>> (D.hg.get(), spatOff);
v1.bindmodel (hgv2);
hgv2->setScalarData (&D.T);
hgv2->zScale.setParams (ZScaleMin, ZScaleMax);
Expand All @@ -345,7 +345,7 @@ int main(int argc, char **argv){

//thermal flux visual.
spatOff = {-0.5f*xzero, yzero, 0.0f };
auto hgv3 = std::make_unique<morph::HexGridVisual<FLT>> (D.hg, spatOff);
auto hgv3 = std::make_unique<morph::HexGridVisual<FLT>> (D.hg.get(), spatOff);
v1.bindmodel (hgv3);
hgv3->setScalarData (&D.THflux);
hgv3->zScale.setParams (ZScaleMin, ZScaleMax);
Expand All @@ -363,7 +363,7 @@ int main(int argc, char **argv){

//total flux visual.
spatOff = {-0.5f*xzero, -yzero, 0.0f };
auto hgv4 = std::make_unique<morph::HexGridVisual<FLT>> (D.hg, spatOff);
auto hgv4 = std::make_unique<morph::HexGridVisual<FLT>> (D.hg.get(), spatOff);
v1.bindmodel (hgv4);
hgv4->setScalarData (&D.THflux);
hgv4->zScale.setParams (ZScaleMin, ZScaleMax);
Expand All @@ -381,7 +381,7 @@ int main(int argc, char **argv){

//type indicator visual.
spatOff = {0.5f*xzero, -yzero, 0.0f };
auto hgv5 = std::make_unique<morph::HexGridVisual<FLT>> (D.hg, spatOff);
auto hgv5 = std::make_unique<morph::HexGridVisual<FLT>> (D.hg.get(), spatOff);
v1.bindmodel (hgv5);
hgv5->setScalarData (&D.show_celltype);
hgv5->zScale.setParams (ZScaleMin, ZScaleMax);
Expand Down