Skip to content

[WIP] Allow input files in massive_star that list largest radius first #87

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
melilly wants to merge 11 commits into
base: main
Choose a base branch
from
Draft

[WIP] Allow input files in massive_star that list largest radius first #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
3b7a49f
Set up old file format reading in
melilly Feb 6, 2026
3ef0657
Set up new file format, and examples of old and new
melilly Feb 6, 2026
a2b301a
Fix data input to generalize between old and new formats
melilly Feb 6, 2026
37901d5
Debug errors; backward compatibility checked
melilly Feb 6, 2026
4b62db5
Merge branch 'main' into read-new-file-format
zingale Feb 12, 2026
cfc56b0
make identification of old/new file format more broad. Fixes the lagr…
melilly Feb 12, 2026
8334d9f
bring model file (and the script that generates it) into compliance w…
melilly Feb 12, 2026
554ea3c
fix mass calculation to work for both ascending and descending radius…
melilly Feb 13, 2026
5575011
Merge 'main' into descending-radius
melilly Feb 13, 2026
eb044b0
Move ascending/descending fix into read_model
melilly Feb 13, 2026
9d04abc
debugging: reverse init model causes segfault
melilly Feb 13, 2026
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
5 changes: 2 additions & 3 deletions massive_star/init_1d.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,6 @@ AMREX_INLINE void init_1d() {
// are mapping onto, and then we want to force it into HSE on that
// mesh.

std::cout << "here " << problem_rp::nx << " " << NPTS_MODEL << std::endl;

if (problem_rp::nx > NPTS_MODEL) {
amrex::Error("too many zones requested -- increase NPTS_MODEL");
}
Expand Down Expand Up @@ -131,6 +129,7 @@ AMREX_INLINE void init_1d() {

std::ofstream of;
of.open("model.orig");
// note the rows will be in reversed order if input file is descending in radius

of << "# initial model as read in" << std::endl;

Expand All @@ -153,7 +152,7 @@ AMREX_INLINE void init_1d() {
Real M_total = (4.0_rt / 3.0_rt) * M_PI * std::pow(initial_model.r(0), 3) *
initial_model.state(0, model::idens);

for (int i = 1; i < initial_model.npts-1; ++i) {
for (int i = 1; i < initial_model.npts; ++i) {
Copy link
Contributor Author

@melilly melilly Feb 13, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed off-by-one error here. didn't impact anything else, just listed total mass


// integrate 4pi r**2 rho using trapezoid

Expand Down
22 changes: 22 additions & 0 deletions read_model.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,6 +298,28 @@ read_file(const std::string filename, initial_model_t& initial_model) {
initial_model.npts = i;

mf.close();

// ensure model is in order of ascending radius, not descending
if (initial_model.r(initial_model.npts-1) < initial_model.r(0)) {
amrex::Array2D<amrex::Real, 0, NPTS_MODEL-1, 0, model::nvar-1> state_copy;
amrex::Array1D<amrex::Real, 0, NPTS_MODEL-1> r_copy;

for (int i = 0; i < initial_model.npts; ++i){ // copy
r_copy(i) = initial_model.r(i);
for (int j = 0; j < model::nvar; ++j) {
state_copy(i,j) = initial_model.state(i,j);
std::cout << state_copy(i,j) << " ";
}
}
std::cout << std::endl << "compared to:" << std::endl;
for (int i = 0; i < initial_model.npts; ++i){ // reverse
initial_model.r(i) = r_copy(initial_model.npts-1-i);
for (int j = 0; j < model::nvar; ++j) {
//std::cout << state_copy(i,j) << " "; //THIS LINE CAUSES SEGFAULT IF UNCOMMENTED
//initial_model.state(i,j) = state_copy(initial_model.npts-1-i,j);
}
}
}
}

#endif