Skip to content

Commit

Permalink
Clean up and astyle
Browse files Browse the repository at this point in the history
  • Loading branch information
@anne-glerum
anne-glerum committed Mar 31, 2019
1 parent 5ff1325 commit 6faab39
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 71 deletions.
29 changes: 13 additions & 16 deletions include/aspect/geometry_model/chunk.h
View file
Expand Up @@ -140,19 +140,19 @@ namespace aspect
virtual
double height_above_reference_surface(const Point<dim> &position) const;

/**
* Whereas the depth function returns the depth with respect
* to the unperturbed surface, this function
* returns the depth with respect to the surface
* including the initial topography. For models without
* initial topography, the result will be the same.
*
* Note that the perturbed surface only considers the
* initially prescribed topography, not any perturbations
* due to a displacement of the free surface. Therefore,
* be careful with using this function if the surface changes
* over time.
*/
/**
* Whereas the depth function returns the depth with respect
* to the unperturbed surface, this function
* returns the depth with respect to the surface
* including the initial topography. For models without
* initial topography, the result will be the same.
*
* Note that the perturbed surface only considers the
* initially prescribed topography, not any perturbations
* due to a displacement of the free surface. Therefore,
* be careful with using this function if the surface changes
* over time.
*/
virtual
double depth_wrt_topo(const Point<dim> &position) const;

Expand Down Expand Up @@ -325,9 +325,6 @@ namespace aspect
*/
void
initialize(const InitialTopographyModel::Interface<dim> *topography);
// TODO remove?
// void
// set_topography_pointer(const InitialTopographyModel::Interface<dim> *topography);

/**
* This function receives a point in cartesian coordinates x, y and z,
Expand Down
60 changes: 8 additions & 52 deletions source/geometry_model/chunk.cc
View file
Expand Up @@ -70,13 +70,6 @@ namespace aspect
topo = topo_pointer;
}

template <int dim>
void
Chunk<dim>::ChunkGeometry::set_topography_pointer(const InitialTopographyModel::Interface<dim> *topo_pointer)
{
topo = topo_pointer;
}


template <int dim>
DerivativeForm<1,dim,dim>
Expand All @@ -87,7 +80,6 @@ namespace aspect

Assert (R > 0.0, ExcMessage("Negative radius for given point."));

// DerivativeForm<1, dim, dim> DX;
Tensor<2,dim> DX;

// prior to deal.II 9, we do not apply initial topography
Expand Down Expand Up @@ -131,7 +123,7 @@ namespace aspect
// They are zero for the ZeroTopography model
Tensor<1,dim-1> topo_derivatives;
if (const InitialTopographyModel::AsciiData<dim> *itm = dynamic_cast<const InitialTopographyModel::AsciiData<dim> *> (topo))
topo_derivatives = itm->vector_gradient(push_forward_sphere(chart_point));
topo_derivatives = itm->vector_gradient(push_forward_sphere(chart_point));

// Construct surface point in lon(,lat) coordinates
Point<dim-1> surface_point;
Expand All @@ -151,7 +143,6 @@ namespace aspect
const double phi_topo = topo_point[1];

// The derivatives of topo_point to chart_point
// DerivativeForm<1, dim, dim> Dtopo;
Tensor<2, dim> Dtopo;
// The derivatives of the cartesian point to chart_point
DerivativeForm<1, dim, dim> Dtotal;
Expand Down Expand Up @@ -181,22 +172,13 @@ namespace aspect
//dy/dphi_topo
DX[1][1] = R_topo * std::cos(phi_topo);

// // dx/dR = dx/dR_topo * dR_topo/dR + dx/dphi_topo * dphi_topo/dR
// Dtotal[0][0] = DX[0][0] * Dtopo[0][0] + DX[0][1] * Dtopo[1][0];
// // dx/dphi = dx/dR_topo * dR_topo/dphi + dx/dphi_topo * dphi_topo/dphi
// Dtotal[0][1] = DX[0][0] * Dtopo[0][1] + DX[0][1] * Dtopo[1][1];
// // dy/dR = dy/dR_topo * dR_topo/dR + dy/dphi_topo * dphi_topo/dR
// Dtotal[1][0] = DX[1][0] * Dtopo[0][0] + DX[1][1] * Dtopo[1][0];
// // dy/dphi = dy/dR_topo * dR_topo/dphi + dy/dphi_topo * dphi_topo/dphi
// Dtotal[1][1] = DX[1][0] * Dtopo[0][1] + DX[1][1] * Dtopo[1][1];

break;
}
case 3:
{
// R_topo = R + topo(phi,theta) * ((R-R_0)/(R_1-R_0))
// phi_topo = phi
// theta_topo = theta
// R_topo = R + topo(phi,theta) * ((R-R_0)/(R_1-R_0))
// phi_topo = phi
// theta_topo = theta
//dR_topo/dR
Dtopo[0][0] = (d_topo / max_depth) + 1.;
//dR_topo/dphi
Expand Down Expand Up @@ -229,25 +211,6 @@ namespace aspect
DX[2][1] = 0;
DX[2][2] = R_topo * std::cos(theta_topo);

// // dx/dR = dx/dR_topo * dR_topo/dR + dx/dphi_topo * dphi_topo/dR + dx/dtheta_topo * dtheta_topo/dR
// Dtotal[0][0] = DX[0][0] * Dtopo[0][0] + DX[0][1] * Dtopo[1][0] + DX[0][2] * Dtopo[2][0];
// // dx/dphi = dx/dR_topo * dR_topo/dphi + dx/dphi_topo * dphi_topo/dphi + dx/dtheta_topo * dtheta_topo/dphi
// Dtotal[0][1] = DX[0][0] * Dtopo[0][1] + DX[0][1] * Dtopo[1][1] + DX[0][2] * Dtopo[2][1];
// // dx/dtheta = dx/dR_topo * dR_topo/dtheta + dx/dphi_topo * dphi_topo/dtheta + dx/dtheta_topo * dtheta_topo/dtheta
// Dtotal[0][2] = DX[0][0] * Dtopo[0][2] + DX[0][1] * Dtopo[1][2] + DX[0][2] * Dtopo[2][2];
// // dy/dR = dy/dR_topo * dR_topo/dR + dy/dphi_topo * dphi_topo/dR + dy/dtheta_topo * dtheta_topo/dR
// Dtotal[1][0] = DX[1][0] * Dtopo[0][0] + DX[0][1] * Dtopo[1][0] + DX[0][2] * Dtopo[2][0];
// // dy/dphi = dy/dR_topo * dR_topo/dphi + dy/dphi_topo * dphi_topo/dphi + dy/dtheta_topo * dtheta_topo/dphi
// Dtotal[1][1] = DX[1][0] * Dtopo[0][1] + DX[0][1] * Dtopo[1][1] + DX[0][2] * Dtopo[2][1];
// // dy/dtheta = dy/dR_topo * dR_topo/dtheta + dy/dphi_topo * dphi_topo/dtheta + dy/dtheta_topo * dtheta_topo/dtheta
// Dtotal[1][2] = DX[1][0] * Dtopo[0][2] + DX[0][1] * Dtopo[1][2] + DX[0][2] * Dtopo[2][2];
// // dz/dR = dz/dR_topo * dR_topo/dR + dz/dphi_topo * dphi_topo/dR + dz/dtheta_topo * dtheta_topo/dR
// Dtotal[2][0] = DX[2][0] * Dtopo[0][0] + DX[0][1] * Dtopo[1][0] + DX[0][2] * Dtopo[2][0];
// // dz/dphi = dz/dR_topo * dR_topo/dphi + dz/dphi_topo * dphi_topo/dphi + dz/dtheta_topo * dtheta_topo/dphi
// Dtotal[2][1] = DX[2][0] * Dtopo[0][1] + DX[0][1] * Dtopo[1][1] + DX[0][2] * Dtopo[2][1];
// // dz/dtheta = dz/dR_topo * dR_topo/dtheta + dz/dphi_topo * dphi_topo/dtheta + dz/dtheta_topo * dtheta_topo/dtheta
// Dtotal[2][2] = DX[2][0] * Dtopo[0][2] + DX[0][1] * Dtopo[1][2] + DX[0][2] * Dtopo[2][2];

break;
}
default:
Expand All @@ -270,9 +233,9 @@ namespace aspect
#else
// Only take into account topography when we're not using the ZeroTopography plugin
if (dynamic_cast<const InitialTopographyModel::ZeroTopography<dim>*>(topo) != nullptr)
return push_forward_sphere(r_phi_theta);
return push_forward_sphere(r_phi_theta);
else
return push_forward_sphere(push_forward_topo(r_phi_theta));
return push_forward_sphere(push_forward_topo(r_phi_theta));
#endif
}

Expand All @@ -286,9 +249,9 @@ namespace aspect
#else
// Only take into account topography when we're not using the ZeroTopography plugin
if (dynamic_cast<const InitialTopographyModel::ZeroTopography<dim>*>(topo) != nullptr)
return pull_back_sphere(x_y_z);
return pull_back_sphere(x_y_z);
else
return pull_back_topo(pull_back_sphere(x_y_z));
return pull_back_topo(pull_back_sphere(x_y_z));
#endif
}

Expand Down Expand Up @@ -656,13 +619,6 @@ namespace aspect
{
this->set_manifold_ids(tria);
});
// Connect the manifold id functions to the signals
//signals.pre_compute_no_normal_flux_constraints.connect (std_cxx11::bind (&Chunk<dim>::clear_manifold_ids,
// std_cxx11::ref(*this),
// std_cxx11::_1));
//signals.post_compute_no_normal_flux_constraints.connect (std_cxx11::bind (&Chunk<dim>::set_manifold_ids,
// std_cxx11::ref(*this),
// std_cxx11::_1));
}
#endif

Expand Down
6 changes: 3 additions & 3 deletions source/utilities.cc
View file
Expand Up @@ -2219,9 +2219,9 @@ namespace aspect
const unsigned int component) const
{
if (this->get_time() - first_data_file_model_time >= 0.0||
(dynamic_cast<const GeometryModel::Chunk<dim>*>(&this->get_geometry_model()) != 0 &&
dynamic_cast<const InitialTopographyModel::AsciiData<dim>*>(&this->get_initial_topography_model()) != 0 &&
isnan(this->get_time())))
(dynamic_cast<const GeometryModel::Chunk<dim>*>(&this->get_geometry_model()) != 0 &&
dynamic_cast<const InitialTopographyModel::AsciiData<dim>*>(&this->get_initial_topography_model()) != 0 &&
isnan(this->get_time())))
{
Point<dim> internal_position = position;

Expand Down

0 comments on commit 6faab39

Please sign in to comment.