Skip to content

Commit

Permalink
Merge pull request #717 from galacticusorg/featSFHFixedAges
Browse files Browse the repository at this point in the history
Implement a star formation history class that provides a tabulation at fixed ages for lightcone output
  • Loading branch information
abensonca authored Oct 16, 2024
2 parents 34d34c5 + f258240 commit 4df7c0e
Show file tree
Hide file tree
Showing 780 changed files with 4,189 additions and 2,564 deletions.
1 change: 1 addition & 0 deletions .github/workflows/cicd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1078,6 +1078,7 @@ jobs:
test-star-formation-histories.py,
test-star-formation-histories-adaptive.py,
test-star-formation-histories-inSitu.py,
test-star-formation-histories-fixedAge.py,
test-mostMassiveProgenitorIsSubhalo.py,
test-lightcone-crossing.py,
test-massProfileSatelliteBoundMass.py,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<parameters>
<formatVersion>2</formatVersion>
<lastModified revision="3f3d9a2af2b05c0a279e4aa3602f89fd682665cc"/>
<lastModified revision="165490f4968c699f7e5bb73ef60bcb7e626f51e6"/>

<!-- Options controlling numerical aspects -->
<massFunctionCovarianceFFTGridSize value="64"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<parameters>
<formatVersion>2</formatVersion>
<lastModified revision="3f3d9a2af2b05c0a279e4aa3602f89fd682665cc"/>
<lastModified revision="165490f4968c699f7e5bb73ef60bcb7e626f51e6"/>

<!-- Options controlling halo model -->
<projectedCorrelationFunctionMassMinimum value="1.0e6"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<parameters>
<formatVersion>2</formatVersion>
<lastModified revision="3f3d9a2af2b05c0a279e4aa3602f89fd682665cc"/>
<lastModified revision="165490f4968c699f7e5bb73ef60bcb7e626f51e6"/>

<!-- Options controlling numerical aspects -->
<massFunctionCovarianceFFTGridSize value="64"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<parameters>
<formatVersion>2</formatVersion>
<lastModified revision="3f3d9a2af2b05c0a279e4aa3602f89fd682665cc"/>
<lastModified revision="165490f4968c699f7e5bb73ef60bcb7e626f51e6"/>

<!-- Options controlling numerical aspects -->
<massFunctionCovarianceFFTGridSize value="64"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<!-- Compute halo mass function -->
<parameters>
<formatVersion>2</formatVersion>
<lastModified revision="3f3d9a2af2b05c0a279e4aa3602f89fd682665cc"/>
<lastModified revision="165490f4968c699f7e5bb73ef60bcb7e626f51e6"/>

<task value="NBodyAnalyze"/>

Expand Down
2 changes: 1 addition & 1 deletion constraints/pipelines/darkMatter/cosmology_MDPL.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<parameters>
<formatVersion>2</formatVersion>
<lastModified revision="3f3d9a2af2b05c0a279e4aa3602f89fd682665cc"/>
<lastModified revision="165490f4968c699f7e5bb73ef60bcb7e626f51e6"/>


<!-- Cosmological parameters and options -->
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<parameters>
<formatVersion>2</formatVersion>
<lastModified revision="3f3d9a2af2b05c0a279e4aa3602f89fd682665cc"/>
<lastModified revision="165490f4968c699f7e5bb73ef60bcb7e626f51e6"/>

<!-- Cosmological parameters and options -->
<cosmologyFunctions value="matterLambda"/>
Expand Down
2 changes: 1 addition & 1 deletion constraints/pipelines/darkMatter/cosmology_Symphony.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<parameters>
<formatVersion>2</formatVersion>
<lastModified revision="3f3d9a2af2b05c0a279e4aa3602f89fd682665cc"/>
<lastModified revision="165490f4968c699f7e5bb73ef60bcb7e626f51e6"/>

<!-- Cosmological parameters and options -->
<cosmologyFunctions value="matterLambda"/>
Expand Down
2 changes: 1 addition & 1 deletion constraints/pipelines/darkMatter/haloMassFunctionBase.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<parameters>
<formatVersion>2</formatVersion>
<lastModified revision="3f3d9a2af2b05c0a279e4aa3602f89fd682665cc"/>
<lastModified revision="165490f4968c699f7e5bb73ef60bcb7e626f51e6"/>

<!-- Task and output -->
<task value="haloMassFunction">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<parameters>
<formatVersion>2</formatVersion>
<lastModified revision="3f3d9a2af2b05c0a279e4aa3602f89fd682665cc"/>
<lastModified revision="165490f4968c699f7e5bb73ef60bcb7e626f51e6"/>

<!-- Output control -->
<outputFileName value="haloMassFunction_BigMDPL_z0.000.hdf5"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<parameters>
<formatVersion>2</formatVersion>
<lastModified revision="3f3d9a2af2b05c0a279e4aa3602f89fd682665cc"/>
<lastModified revision="165490f4968c699f7e5bb73ef60bcb7e626f51e6"/>

<!-- Output control -->
<outputFileName value="haloMassFunction_BigMDPL_z0.492.hdf5"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<parameters>
<formatVersion>2</formatVersion>
<lastModified revision="3f3d9a2af2b05c0a279e4aa3602f89fd682665cc"/>
<lastModified revision="165490f4968c699f7e5bb73ef60bcb7e626f51e6"/>

<!-- Output control -->
<outputFileName value="haloMassFunction_BigMDPL_z1.000.hdf5"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<parameters>
<formatVersion>2</formatVersion>
<lastModified revision="3f3d9a2af2b05c0a279e4aa3602f89fd682665cc"/>
<lastModified revision="165490f4968c699f7e5bb73ef60bcb7e626f51e6"/>

<!-- Output control -->
<outputFileName value="haloMassFunction_BigMDPL_z2.145.hdf5"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<parameters>
<formatVersion>2</formatVersion>
<lastModified revision="3f3d9a2af2b05c0a279e4aa3602f89fd682665cc"/>
<lastModified revision="165490f4968c699f7e5bb73ef60bcb7e626f51e6"/>

<!-- Output control -->
<outputFileName value="haloMassFunction_BigMDPL_z2.891.hdf5"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<parameters>
<formatVersion>2</formatVersion>
<lastModified revision="3f3d9a2af2b05c0a279e4aa3602f89fd682665cc"/>
<lastModified revision="165490f4968c699f7e5bb73ef60bcb7e626f51e6"/>

<!-- Output control -->
<outputFileName value="haloMassFunction_HugeMDPL_z0.000.hdf5"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<parameters>
<formatVersion>2</formatVersion>
<lastModified revision="3f3d9a2af2b05c0a279e4aa3602f89fd682665cc"/>
<lastModified revision="165490f4968c699f7e5bb73ef60bcb7e626f51e6"/>

<!-- Output control -->
<outputFileName value="haloMassFunction_HugeMDPL_z0.490.hdf5"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<parameters>
<formatVersion>2</formatVersion>
<lastModified revision="3f3d9a2af2b05c0a279e4aa3602f89fd682665cc"/>
<lastModified revision="165490f4968c699f7e5bb73ef60bcb7e626f51e6"/>

<!-- Output control -->
<outputFileName value="haloMassFunction_HugeMDPL_z0.987.hdf5"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<parameters>
<formatVersion>2</formatVersion>
<lastModified revision="3f3d9a2af2b05c0a279e4aa3602f89fd682665cc"/>
<lastModified revision="165490f4968c699f7e5bb73ef60bcb7e626f51e6"/>

<!-- Output control -->
<outputFileName value="haloMassFunction_HugeMDPL_z2.028.hdf5"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<parameters>
<formatVersion>2</formatVersion>
<lastModified revision="3f3d9a2af2b05c0a279e4aa3602f89fd682665cc"/>
<lastModified revision="165490f4968c699f7e5bb73ef60bcb7e626f51e6"/>

<!-- Output control -->
<outputFileName value="haloMassFunction_HugeMDPL_z3.037.hdf5"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<parameters>
<formatVersion>2</formatVersion>
<lastModified revision="3f3d9a2af2b05c0a279e4aa3602f89fd682665cc"/>
<lastModified revision="165490f4968c699f7e5bb73ef60bcb7e626f51e6"/>

<!-- Output control -->
<outputFileName value="haloMassFunction_LMC_Halo032_z0.000.hdf5"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<parameters>
<formatVersion>2</formatVersion>
<lastModified revision="3f3d9a2af2b05c0a279e4aa3602f89fd682665cc"/>
<lastModified revision="165490f4968c699f7e5bb73ef60bcb7e626f51e6"/>

<!-- Output control -->
<outputFileName value="haloMassFunction_LMC_Halo032_z0.504.hdf5"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<parameters>
<formatVersion>2</formatVersion>
<lastModified revision="3f3d9a2af2b05c0a279e4aa3602f89fd682665cc"/>
<lastModified revision="165490f4968c699f7e5bb73ef60bcb7e626f51e6"/>

<!-- Output control -->
<outputFileName value="haloMassFunction_LMC_Halo032_z0.990.hdf5"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<parameters>
<formatVersion>2</formatVersion>
<lastModified revision="3f3d9a2af2b05c0a279e4aa3602f89fd682665cc"/>
<lastModified revision="165490f4968c699f7e5bb73ef60bcb7e626f51e6"/>

<!-- Output control -->
<outputFileName value="haloMassFunction_LMC_Halo032_z2.031.hdf5"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<parameters>
<formatVersion>2</formatVersion>
<lastModified revision="3f3d9a2af2b05c0a279e4aa3602f89fd682665cc"/>
<lastModified revision="165490f4968c699f7e5bb73ef60bcb7e626f51e6"/>

<!-- Output control -->
<outputFileName value="haloMassFunction_LMC_Halo032_z3.984.hdf5"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<parameters>
<formatVersion>2</formatVersion>
<lastModified revision="3f3d9a2af2b05c0a279e4aa3602f89fd682665cc"/>
<lastModified revision="165490f4968c699f7e5bb73ef60bcb7e626f51e6"/>

<!-- Output control -->
<outputFileName value="haloMassFunction_LMC_Halo059_z0.000.hdf5"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<parameters>
<formatVersion>2</formatVersion>
<lastModified revision="3f3d9a2af2b05c0a279e4aa3602f89fd682665cc"/>
<lastModified revision="165490f4968c699f7e5bb73ef60bcb7e626f51e6"/>

<!-- Output control -->
<outputFileName value="haloMassFunction_LMC_Halo059_z0.504.hdf5"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<parameters>
<formatVersion>2</formatVersion>
<lastModified revision="3f3d9a2af2b05c0a279e4aa3602f89fd682665cc"/>
<lastModified revision="165490f4968c699f7e5bb73ef60bcb7e626f51e6"/>

<!-- Output control -->
<outputFileName value="haloMassFunction_LMC_Halo059_z0.990.hdf5"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<parameters>
<formatVersion>2</formatVersion>
<lastModified revision="3f3d9a2af2b05c0a279e4aa3602f89fd682665cc"/>
<lastModified revision="165490f4968c699f7e5bb73ef60bcb7e626f51e6"/>

<!-- Output control -->
<outputFileName value="haloMassFunction_LMC_Halo059_z2.031.hdf5"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<parameters>
<formatVersion>2</formatVersion>
<lastModified revision="3f3d9a2af2b05c0a279e4aa3602f89fd682665cc"/>
<lastModified revision="165490f4968c699f7e5bb73ef60bcb7e626f51e6"/>

<!-- Output control -->
<outputFileName value="haloMassFunction_LMC_Halo059_z3.984.hdf5"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<parameters>
<formatVersion>2</formatVersion>
<lastModified revision="3f3d9a2af2b05c0a279e4aa3602f89fd682665cc"/>
<lastModified revision="165490f4968c699f7e5bb73ef60bcb7e626f51e6"/>

<!-- Output control -->
<outputFileName value="haloMassFunction_LMC_Halo0662_z0.000.hdf5"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<parameters>
<formatVersion>2</formatVersion>
<lastModified revision="3f3d9a2af2b05c0a279e4aa3602f89fd682665cc"/>
<lastModified revision="165490f4968c699f7e5bb73ef60bcb7e626f51e6"/>

<!-- Output control -->
<outputFileName value="haloMassFunction_LMC_Halo0662_z0.504.hdf5"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<parameters>
<formatVersion>2</formatVersion>
<lastModified revision="3f3d9a2af2b05c0a279e4aa3602f89fd682665cc"/>
<lastModified revision="165490f4968c699f7e5bb73ef60bcb7e626f51e6"/>

<!-- Output control -->
<outputFileName value="haloMassFunction_LMC_Halo0662_z0.990.hdf5"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<parameters>
<formatVersion>2</formatVersion>
<lastModified revision="3f3d9a2af2b05c0a279e4aa3602f89fd682665cc"/>
<lastModified revision="165490f4968c699f7e5bb73ef60bcb7e626f51e6"/>

<!-- Output control -->
<outputFileName value="haloMassFunction_LMC_Halo0662_z2.031.hdf5"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<parameters>
<formatVersion>2</formatVersion>
<lastModified revision="3f3d9a2af2b05c0a279e4aa3602f89fd682665cc"/>
<lastModified revision="165490f4968c699f7e5bb73ef60bcb7e626f51e6"/>

<!-- Output control -->
<outputFileName value="haloMassFunction_LMC_Halo0662_z3.984.hdf5"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<parameters>
<formatVersion>2</formatVersion>
<lastModified revision="3f3d9a2af2b05c0a279e4aa3602f89fd682665cc"/>
<lastModified revision="165490f4968c699f7e5bb73ef60bcb7e626f51e6"/>

<!-- Output control -->
<outputFileName value="haloMassFunction_LMC_Halo083_z0.000.hdf5"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<parameters>
<formatVersion>2</formatVersion>
<lastModified revision="3f3d9a2af2b05c0a279e4aa3602f89fd682665cc"/>
<lastModified revision="165490f4968c699f7e5bb73ef60bcb7e626f51e6"/>

<!-- Output control -->
<outputFileName value="haloMassFunction_LMC_Halo083_z0.504.hdf5"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<parameters>
<formatVersion>2</formatVersion>
<lastModified revision="3f3d9a2af2b05c0a279e4aa3602f89fd682665cc"/>
<lastModified revision="165490f4968c699f7e5bb73ef60bcb7e626f51e6"/>

<!-- Output control -->
<outputFileName value="haloMassFunction_LMC_Halo083_z0.990.hdf5"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<parameters>
<formatVersion>2</formatVersion>
<lastModified revision="3f3d9a2af2b05c0a279e4aa3602f89fd682665cc"/>
<lastModified revision="165490f4968c699f7e5bb73ef60bcb7e626f51e6"/>

<!-- Output control -->
<outputFileName value="haloMassFunction_LMC_Halo083_z2.031.hdf5"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<parameters>
<formatVersion>2</formatVersion>
<lastModified revision="3f3d9a2af2b05c0a279e4aa3602f89fd682665cc"/>
<lastModified revision="165490f4968c699f7e5bb73ef60bcb7e626f51e6"/>

<!-- Output control -->
<outputFileName value="haloMassFunction_LMC_Halo083_z3.984.hdf5"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<parameters>
<formatVersion>2</formatVersion>
<lastModified revision="3f3d9a2af2b05c0a279e4aa3602f89fd682665cc"/>
<lastModified revision="165490f4968c699f7e5bb73ef60bcb7e626f51e6"/>

<!-- Output control -->
<outputFileName value="haloMassFunction_LMC_Halo088_z0.000.hdf5"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<parameters>
<formatVersion>2</formatVersion>
<lastModified revision="3f3d9a2af2b05c0a279e4aa3602f89fd682665cc"/>
<lastModified revision="165490f4968c699f7e5bb73ef60bcb7e626f51e6"/>

<!-- Output control -->
<outputFileName value="haloMassFunction_LMC_Halo088_z0.504.hdf5"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<parameters>
<formatVersion>2</formatVersion>
<lastModified revision="3f3d9a2af2b05c0a279e4aa3602f89fd682665cc"/>
<lastModified revision="165490f4968c699f7e5bb73ef60bcb7e626f51e6"/>

<!-- Output control -->
<outputFileName value="haloMassFunction_LMC_Halo088_z0.990.hdf5"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<parameters>
<formatVersion>2</formatVersion>
<lastModified revision="3f3d9a2af2b05c0a279e4aa3602f89fd682665cc"/>
<lastModified revision="165490f4968c699f7e5bb73ef60bcb7e626f51e6"/>

<!-- Output control -->
<outputFileName value="haloMassFunction_LMC_Halo088_z2.031.hdf5"/>
Expand Down
Loading

0 comments on commit 4df7c0e

Please sign in to comment.