Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ Our [detailed documentation](https://entity-toolkit.github.io/) includes everyth

## Branch policy

Master branch contains the latest stable version of the code which has already been released. Development on the core is done on branches starting with `dev/`. User-specific modifications (i.e., new problem generators plus perhaps minor corrections in the core) are done on branches starting with `pgen/`. Before merging to the master branch, all the branches must first be merged to the latest release-candidate branch, which ends with `rc`, via a pull request. After which, when all the release goals are met, the `rc` branch is merged to the master and released as a new stable version. Stale branches will be archived with a tag starting with `archive/` (can still be accessed via the "Tags" tab) and removed.
Master branch contains the latest stable version of the code which has already been released. Development on the core is done on branches starting with `dev/`, while fixing bugs is done in branches that start with `bug/`. User-specific modifications (i.e., new problem generators plus perhaps minor corrections in the core) are done on branches starting with `pgen/`. Before merging to the master branch, all the branches must first be merged to the latest release-candidate branch, which ends with `rc`, via a pull request. After which, when all the release goals are met, the `rc` branch is merged to the master and released as a new stable version. Stale branches will be archived with a tag starting with `archive/` (can still be accessed via the "Tags" tab) and removed.
4 changes: 4 additions & 0 deletions src/metrics/qspherical.h
Original file line number Diff line number Diff line change
Expand Up @@ -317,6 +317,8 @@ namespace metric {
return v_in * math::exp(xi[0] * dchi + chi_min) * dchi;
} else if constexpr (i == 2) {
return v_in * (dtheta_deta(xi[1] * deta + eta_min) * deta);
} else if constexpr (D == Dim::_2D) {
return v_in;
} else {
return v_in * dphi;
}
Expand All @@ -327,6 +329,8 @@ namespace metric {
return v_in * dchi_inv / (math::exp(xi[0] * dchi + chi_min));
} else if constexpr (i == 2) {
return v_in * deta_inv / (dtheta_deta(xi[1] * deta + eta_min));
} else if constexpr (D == Dim::_2D) {
return v_in;
} else {
return v_in * dphi_inv;
}
Expand Down
4 changes: 4 additions & 0 deletions src/metrics/spherical.h
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,8 @@ namespace metric {
return v_in * dr;
} else if constexpr (i == 2) {
return v_in * dtheta;
} else if constexpr (D == Dim::_2D) {
return v_in;
} else {
return v_in * dphi;
}
Expand All @@ -295,6 +297,8 @@ namespace metric {
return v_in * dr_inv;
} else if constexpr (i == 2) {
return v_in * dtheta_inv;
} else if constexpr (D == Dim::_2D) {
return v_in;
} else {
return v_in * dphi_inv;
}
Expand Down