Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
83 commits
Select commit Hold shift + click to select a range
494c619
Added a Toomre-type disk for deprojection primarily
The9Cat Mar 12, 2026
c7bf5ee
Added an enum and reflector for deprojection disk types and included …
The9Cat Mar 12, 2026
6efc024
Addded a test routine for Abel deprojection; updated EmpCylSL for der…
Mar 13, 2026
22adb60
Missing source driver file
Mar 13, 2026
b12a1f8
Missing test class
Mar 13, 2026
3cf4d6c
Potential fix for pull request finding
The9Cat Mar 13, 2026
a03bbe6
Potential fix for pull request finding
The9Cat Mar 13, 2026
4042544
Potential fix for pull request finding
The9Cat Mar 13, 2026
db0e02d
Potential fix for pull request finding
The9Cat Mar 13, 2026
dfc99f9
Potential fix for pull request finding
The9Cat Mar 13, 2026
2e6fee4
Potential fix for pull request finding
The9Cat Mar 13, 2026
204d43d
Add a test routine from EmpDeproj alone; fix parsing error in testEmp…
Mar 13, 2026
0e82cb6
Updated parsing in BiorthBasis::Cylindrical for deprojection
The9Cat Mar 13, 2026
cb5e150
Potential fix for pull request finding
The9Cat Mar 13, 2026
5f151bc
Potential fix for pull request finding
The9Cat Mar 13, 2026
b761050
Potential fix for pull request finding
The9Cat Mar 13, 2026
25f893d
Potential fix for pull request finding
The9Cat Mar 13, 2026
f9a6ae2
Potential fix for pull request finding
The9Cat Mar 13, 2026
5a66623
Potential fix for pull request finding
The9Cat Mar 13, 2026
4175b1e
Potential fix for pull request finding
The9Cat Mar 13, 2026
31dad72
Potential fix for pull request finding
The9Cat Mar 13, 2026
9c2f36f
Potential fix for pull request finding
The9Cat Mar 13, 2026
22b6493
Use new sech^2 scaling
Mar 13, 2026
84bef8f
Merge branch 'Toomre' of github.com:EXP-code/EXP into Toomre
Mar 13, 2026
9439daa
Python deprojection test routine; add possibility of a separate Pytho…
Mar 13, 2026
1d50ae5
Fix typo in parameter assignment
The9Cat Mar 14, 2026
eb1f9eb
Remove the initial test function; add doc strings to the help stanza …
Mar 14, 2026
6402d49
Only print deprojection info from one node
Mar 14, 2026
5b0aa7d
Merge branch 'devel' into Toomre
The9Cat Mar 14, 2026
c934a79
Potential fix for pull request finding
The9Cat Mar 14, 2026
5a95b50
Potential fix for pull request finding
The9Cat Mar 14, 2026
402dc25
Potential fix for pull request finding
The9Cat Mar 14, 2026
4513d2a
Potential fix for pull request finding
The9Cat Mar 14, 2026
e719f9f
Potential fix for pull request finding
The9Cat Mar 14, 2026
627de49
Potential fix for pull request finding
The9Cat Mar 14, 2026
f5a39b4
Potential fix for pull request finding
The9Cat Mar 14, 2026
b6f5c03
Potential fix for pull request finding
The9Cat Mar 14, 2026
3dcafad
Potential fix for pull request finding
The9Cat Mar 14, 2026
8e5872e
Potential fix for pull request finding
The9Cat Mar 14, 2026
79e0233
Initial plan
Copilot Mar 14, 2026
9c0d024
Fix clang build: change constexpr to const for pi = std::acos(-1.0)
Copilot Mar 14, 2026
5aed459
Merge pull request #209 from EXP-code/copilot/sub-pr-208
The9Cat Mar 14, 2026
45a578f
Potential fix for pull request finding
The9Cat Mar 15, 2026
36120a3
Potential fix for pull request finding
The9Cat Mar 15, 2026
1b1f297
Potential fix for pull request finding
The9Cat Mar 15, 2026
fdb16ed
Potential fix for pull request finding
The9Cat Mar 15, 2026
d240679
Potential fix for pull request finding
The9Cat Mar 15, 2026
18b1455
Accidentally deleted the 'logr' key; restored
Mar 16, 2026
ab91951
Apply suggestions from code review
michael-petersen Mar 23, 2026
446d52b
add version number increment proposal
michael-petersen Mar 23, 2026
cb3c977
erroneous const breaking compile
michael-petersen Mar 23, 2026
0fdaf62
Merge branch 'devel' into Toomre
michael-petersen Mar 23, 2026
ccd4630
Added first implemenation for saving and reading DTYPE and Python md5…
Mar 23, 2026
6acbe73
Added ptype support to the Cylindrical cache
Mar 24, 2026
8dcc0a8
Clean up the unique_ptr using a custom deleter
Mar 24, 2026
9d11213
restore testED binary
michael-petersen Mar 24, 2026
cc7f53e
Added standalone md5 hash code to avoid problems with Mac and Windows…
Mar 24, 2026
11987e5
Added missing md5 hash test code
Mar 24, 2026
fc16ed9
Additional cache failure info for debug
Mar 24, 2026
31925de
Need to define DTYPE before cache check
Mar 24, 2026
f40f1ed
Updates on the n-body side to handle conditioning types
Mar 24, 2026
8f52405
A few minor checks for md5 tests; requires a GNU/Linux system
Mar 24, 2026
f608704
Add more HDF5 diagnostics
Mar 24, 2026
e02eb78
Fix mistake in storing pyname info vector
Mar 24, 2026
8cba2a7
Additional comments [no CI]
Mar 24, 2026
20eb5af
Missing '.py' suffix in md5 file call
Mar 24, 2026
d60f5e3
Identify member function errors in Cylinder [no CI]
Mar 24, 2026
26a896c
Added more diagnostics
Mar 24, 2026
82062e9
More comments and output update with debugging info
Mar 24, 2026
26a85cc
Merge branch 'Toomre' of github.com:EXP-code/EXP into Toomre
Mar 24, 2026
e641cc5
Wrong tag type on read
Mar 24, 2026
b10c2ef
Try to autodeduce the HighFive types for simplicity
Mar 24, 2026
8e6ed66
More nested checking for Cylinder
Mar 24, 2026
e40d6ad
Remove duplicateed DiskType check
Mar 24, 2026
2f874d7
Additional comments only [No CI]
Mar 24, 2026
82de030
Attempted to fix garbled deprojection logic in BiorthBasis and EmpCylSL
Mar 25, 2026
b23224b
Missing case transformation for dmodel
Mar 25, 2026
fe2e667
Additional comments only [no ci]
Mar 25, 2026
567f005
Minor sanity-check logic tweak
Mar 25, 2026
5fc1198
Add defaults for mtype and dtype to Cylinder
Mar 25, 2026
0c49ed0
Deduplicate cache tags, oops
Mar 25, 2026
2ef3aba
Added automatic output of valid EmpModel types
Mar 26, 2026
73a47f6
Added deprojection support to Cylinder
Mar 26, 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
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,6 @@
[submodule "extern/HighFive"]
path = extern/HighFive
url = https://github.com/BlueBrain/HighFive.git
[submodule "extern/QuickDigest5"]
path = extern/QuickDigest5
url = https://github.com/nthnn/QuickDigest5.git
1 change: 1 addition & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,7 @@ execute_process(

include_directories(${PROJECT_SOURCE_DIR}/extern/yaml-cpp/include)
include_directories(${PROJECT_SOURCE_DIR}/extern/pybind11/include)
include_directories(${PROJECT_SOURCE_DIR}/extern/QuickDigest5/include)

# Report to the user
message("Configuring build for ${GIT_BRANCH}/${GIT_COMMIT} at ${COMPILE_TIME}")
Expand Down
21 changes: 18 additions & 3 deletions expui/BiorthBasis.H
Original file line number Diff line number Diff line change
Expand Up @@ -1071,11 +1071,12 @@ namespace BasisClasses
//! Basis construction parameters
double aratio, hratio, dweight, rwidth, ashift, rfactor, rtrunc, ppow, Mfac, HERNA;
bool Ignore, deproject;
std::string pyname;
std::string pyname, pyproj;

//! DiskType support
//
enum DiskType { constant, gaussian, mn, exponential, doubleexpon, diskbulge, python };
//!
enum class DiskType
{ constant, gaussian, mn, exponential, doubleexpon, diskbulge, python };
DiskType DTYPE;
std::string mtype, dtype, dmodel;

Expand All @@ -1084,6 +1085,20 @@ namespace BasisClasses
double dcond(double R, double z, double phi, int M);
std::shared_ptr<DiskDensityFunc> pyDens;

//@{
//! DeprojType support

//! Disk models used for deprojection
enum class DeprojType
{ mn, toomre, python, exponential};

//! Current model
DeprojType PTYPE;

//! Look up by string
static const std::map<std::string, DeprojType> dplookup;
//@}

protected:

//! Evaluate basis in spherical coordinates
Expand Down
Loading
Loading