fix: some destructor warning
This commit is contained in:
parent
86fda876b1
commit
e43df5df78
|
|
@ -26,6 +26,7 @@ public:
|
||||||
return metre / 1000. / 1.852 / 60.;
|
return metre / 1000. / 1.852 / 60.;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
virtual ~AdvectionKernel() = default; // Apparently I need this, idk why
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif //ADVECTION_ADVECTIONKERNEL_H
|
#endif //ADVECTION_ADVECTIONKERNEL_H
|
||||||
|
|
|
||||||
|
|
@ -100,7 +100,7 @@ void EGlyphLayer::updateData(int t) {
|
||||||
for (int lat = 0; lat < uvGrid->latSize; lat++) {
|
for (int lat = 0; lat < uvGrid->latSize; lat++) {
|
||||||
for (int lon = 0; lon < uvGrid->lonSize; lon++) {
|
for (int lon = 0; lon < uvGrid->lonSize; lon++) {
|
||||||
auto [u, v] = (*uvGrid)[t/3600, lat, lon];
|
auto [u, v] = (*uvGrid)[t/3600, lat, lon];
|
||||||
// TODO: The 5*v stuff should really be a filter transform
|
// TODO: 5*v scaling stuff should really be a filter transform
|
||||||
this->direction->SetTuple3(i, 5*u, 5*v, 0);
|
this->direction->SetTuple3(i, 5*u, 5*v, 0);
|
||||||
i++;
|
i++;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -75,8 +75,7 @@ void LGlyphLayer::spoofPoints() {
|
||||||
this->points->InsertNextPoint(6.532949683882039, 53.24308582564463, 0); // Coordinates of Zernike
|
this->points->InsertNextPoint(6.532949683882039, 53.24308582564463, 0); // Coordinates of Zernike
|
||||||
this->points->InsertNextPoint(5.315307819255385, 60.40001057122271, 0); // Coordinates of Bergen
|
this->points->InsertNextPoint(5.315307819255385, 60.40001057122271, 0); // Coordinates of Bergen
|
||||||
this->points->InsertNextPoint(6.646210231365825, 46.52346296009023, 0); // Coordinates of Lausanne
|
this->points->InsertNextPoint(6.646210231365825, 46.52346296009023, 0); // Coordinates of Lausanne
|
||||||
this->points->InsertNextPoint(-6.553894313570932, 62.39522131195857,
|
this->points->InsertNextPoint(-6.553894313570932, 62.39522131195857,0); // Coordinates of the top of the Faroe islands
|
||||||
0); // Coordinates of the top of the Faroe islands
|
|
||||||
|
|
||||||
this->points->Modified();
|
this->points->Modified();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -24,7 +24,7 @@ int main() {
|
||||||
shared_ptr<UVGrid> uvGrid = std::make_shared<UVGrid>();
|
shared_ptr<UVGrid> uvGrid = std::make_shared<UVGrid>();
|
||||||
auto kernelRK4 = make_unique<RK4AdvectionKernel>(uvGrid);
|
auto kernelRK4 = make_unique<RK4AdvectionKernel>(uvGrid);
|
||||||
|
|
||||||
auto l = new LGlyphLayer(uvGrid, move(kernelRK4));
|
auto l = new LGlyphLayer(uvGrid, std::move(kernelRK4));
|
||||||
|
|
||||||
Program *program = new Program(DT);
|
Program *program = new Program(DT);
|
||||||
program->addLayer(new BackgroundImage("../../../../data/map_661-661.png"));
|
program->addLayer(new BackgroundImage("../../../../data/map_661-661.png"));
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue