Skip to content

Commit

Permalink
Merge pull request #6187 from gassmoeller/update_dynamic_core_2
Browse files Browse the repository at this point in the history
Update code style in dynamic core 2
  • Loading branch information
tjhei authored Dec 13, 2024
2 parents 64c5199 + 7d5bac3 commit 019cb2b
Show file tree
Hide file tree
Showing 2 changed files with 498 additions and 491 deletions.
8 changes: 4 additions & 4 deletions include/aspect/boundary_temperature/dynamic_core.h
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ namespace aspect
/**
* Max iterations for the core energy balance solver.
*/
int max_steps;
unsigned int max_steps;

/**
* Temperature correction value for adiabatic
Expand Down Expand Up @@ -409,8 +409,8 @@ namespace aspect
double get_Ts(const double r) const;

/**
* Compute the core solidus at certain pressure @p pressure
* and light element concentration @p X (in wt.%).
* Compute the core solidus at a given light element concentration @p X (in wt.%)
* and pressure @p pressure.
*/
double get_solidus(const double X, const double pressure) const;

Expand All @@ -434,7 +434,7 @@ namespace aspect
/**
* Calculate Sn(B,R), referring to \cite NPB+04 .
*/
double fun_Sn(const double B, const double R, const double n) const;
double fun_Sn(const double B, const double R, const unsigned int n) const;

/**
* Calculate density at given radius @p r.
Expand Down
Loading

0 comments on commit 019cb2b

Please sign in to comment.