Skip to content

Commit

Permalink
Fix tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@gassmoeller
gassmoeller committed Jan 29, 2025
1 parent dafd5a9 commit 30f7ad2
Show file tree
Hide file tree
Showing 14 changed files with 2,470 additions and 2,423 deletions.
370 changes: 187 additions & 183 deletions tests/composite_viscous_outputs.cc
View file

Large diffs are not rendered by default.

396 changes: 200 additions & 196 deletions tests/composite_viscous_outputs_isostress.cc
View file

Large diffs are not rendered by default.

392 changes: 198 additions & 194 deletions tests/composite_viscous_outputs_limited.cc
View file

Large diffs are not rendered by default.

353 changes: 178 additions & 175 deletions tests/composite_viscous_outputs_no_peierls.cc
View file

Large diffs are not rendered by default.

469 changes: 236 additions & 233 deletions tests/composite_viscous_outputs_phases.cc
View file

Large diffs are not rendered by default.

101 changes: 52 additions & 49 deletions tests/coordinate_transformation.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,71 +23,74 @@

#include <iostream>

using namespace aspect::Utilities;
namespace aspect
{
using namespace aspect::Utilities;
// Check various conversions between cartesian and spherical coordinates

template <typename T, unsigned int dim>
void check_point(T point1, T point2)
{
std::cout << std::endl << "Point 1: ";
for (unsigned int i = 0; i < dim; ++i)
std::cout << point1[i] << ' ';
template <typename T, unsigned int dim>
void check_point(T point1, T point2)
{
std::cout << std::endl << "Point 1: ";
for (unsigned int i = 0; i < dim; ++i)
std::cout << point1[i] << ' ';

std::cout << std::endl << "Point 2: ";
for (unsigned int i = 0; i < dim; ++i)
std::cout << point2[i] << ' ';
std::cout << std::endl << "Point 2: ";
for (unsigned int i = 0; i < dim; ++i)
std::cout << point2[i] << ' ';

std::cout << std::endl;
}
std::cout << std::endl;
}

int f()
{
const dealii::Point<2> origin2(0,0);
const dealii::Point<3> origin3(0,0,0);
int f()
{
const dealii::Point<2> origin2(0,0);
const dealii::Point<3> origin3(0,0,0);

const std::array<double,2> sorigin2 = {{0,0}};
const std::array<double,3> sorigin3 = {{0,0,0}};
const std::array<double,2> sorigin2 = {{0,0}};
const std::array<double,3> sorigin3 = {{0,0,0}};

const dealii::Point<2> one2(1,1);
const dealii::Point<3> one3(1,1,1);
const dealii::Point<2> one2(1,1);
const dealii::Point<3> one3(1,1,1);

const std::array<double,2> sone2 = {{std::sqrt(2),numbers::PI/4}};
const std::array<double,3> sone3 = {{std::sqrt(3),numbers::PI/4,std::acos(1/std::sqrt(3))}};
const std::array<double,2> sone2 = {{std::sqrt(2),numbers::PI/4}};
const std::array<double,3> sone3 = {{std::sqrt(3),numbers::PI/4,std::acos(1/std::sqrt(3))}};

const dealii::Point<3> x(1,0,0);
const dealii::Point<3> y(0,1,0);
const dealii::Point<3> z(0,0,1);
const dealii::Point<3> x(1,0,0);
const dealii::Point<3> y(0,1,0);
const dealii::Point<3> z(0,0,1);

const std::array<double,3> sx = {{1,0,numbers::PI/2}};
const std::array<double,3> sy = {{1,numbers::PI/2,numbers::PI/2}};
const std::array<double,3> sz = {{1,0,0}};
const std::array<double,3> sx = {{1,0,numbers::PI/2}};
const std::array<double,3> sy = {{1,numbers::PI/2,numbers::PI/2}};
const std::array<double,3> sz = {{1,0,0}};

check_point<const std::array<double,2>,2>(Coordinates::cartesian_to_spherical_coordinates(origin2),sorigin2);
check_point<const std::array<double,3>,3>(Coordinates::cartesian_to_spherical_coordinates(origin3),sorigin3);
check_point<const Point<2>,2>(origin2, Coordinates::spherical_to_cartesian_coordinates<2>(sorigin2));
check_point<const Point<3>,3>(origin3, Coordinates::spherical_to_cartesian_coordinates<3>(sorigin3));
check_point<const std::array<double,2>,2>(Coordinates::cartesian_to_spherical_coordinates(origin2),sorigin2);
check_point<const std::array<double,3>,3>(Coordinates::cartesian_to_spherical_coordinates(origin3),sorigin3);
check_point<const Point<2>,2>(origin2, Coordinates::spherical_to_cartesian_coordinates<2>(sorigin2));
check_point<const Point<3>,3>(origin3, Coordinates::spherical_to_cartesian_coordinates<3>(sorigin3));

check_point<const std::array<double,2>,2>(Coordinates::cartesian_to_spherical_coordinates(one2),sone2);
check_point<const std::array<double,3>,3>(Coordinates::cartesian_to_spherical_coordinates(one3),sone3);
check_point<const Point<2>,2>(one2, Coordinates::spherical_to_cartesian_coordinates<2>(sone2));
check_point<const Point<3>,3>(one3, Coordinates::spherical_to_cartesian_coordinates<3>(sone3));
check_point<const std::array<double,2>,2>(Coordinates::cartesian_to_spherical_coordinates(one2),sone2);
check_point<const std::array<double,3>,3>(Coordinates::cartesian_to_spherical_coordinates(one3),sone3);
check_point<const Point<2>,2>(one2, Coordinates::spherical_to_cartesian_coordinates<2>(sone2));
check_point<const Point<3>,3>(one3, Coordinates::spherical_to_cartesian_coordinates<3>(sone3));

check_point<const Point<3>,3>(x, Coordinates::spherical_to_cartesian_coordinates<3>(sx));
check_point<const Point<3>,3>(y, Coordinates::spherical_to_cartesian_coordinates<3>(sy));
check_point<const Point<3>,3>(z, Coordinates::spherical_to_cartesian_coordinates<3>(sz));
check_point<const Point<3>,3>(x, Coordinates::spherical_to_cartesian_coordinates<3>(sx));
check_point<const Point<3>,3>(y, Coordinates::spherical_to_cartesian_coordinates<3>(sy));
check_point<const Point<3>,3>(z, Coordinates::spherical_to_cartesian_coordinates<3>(sz));

check_point<const std::array<double,3>,3>(Coordinates::cartesian_to_spherical_coordinates(x),sx);
check_point<const std::array<double,3>,3>(Coordinates::cartesian_to_spherical_coordinates(y),sy);
check_point<const std::array<double,3>,3>(Coordinates::cartesian_to_spherical_coordinates(z),sz);
check_point<const std::array<double,3>,3>(Coordinates::cartesian_to_spherical_coordinates(x),sx);
check_point<const std::array<double,3>,3>(Coordinates::cartesian_to_spherical_coordinates(y),sy);
check_point<const std::array<double,3>,3>(Coordinates::cartesian_to_spherical_coordinates(z),sz);

const dealii::Point<3> dateline(0,-1,0);
const std::array<double,3> sdateline = {{1,3*numbers::PI/2,numbers::PI/2}};
const dealii::Point<3> dateline(0,-1,0);
const std::array<double,3> sdateline = {{1,3*numbers::PI/2,numbers::PI/2}};

check_point<const Point<3>,3>(dateline, Coordinates::spherical_to_cartesian_coordinates<3>(sdateline));
check_point<const std::array<double,3>,3>(Coordinates::cartesian_to_spherical_coordinates(dateline),sdateline);
check_point<const Point<3>,3>(dateline, Coordinates::spherical_to_cartesian_coordinates<3>(sdateline));
check_point<const std::array<double,3>,3>(Coordinates::cartesian_to_spherical_coordinates(dateline),sdateline);


return 42;
}
return 42;
}

int i = f();
int i = f();
}
Loading

0 comments on commit 30f7ad2

Please sign in to comment.