Skip to content
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

Jump to bottom

Merge dev into main #370

Merged
merged 948 commits into from
Feb 2, 2024
Merged

Merge dev into main #370

merged 948 commits into from
Feb 2, 2024

Conversation

evaneschneider
Copy link
Collaborator

This PR will merge the current version of dev into main, prior to the Cholla 3.0.0 release.

evaneschneider and others added 30 commits September 20, 2023 14:41
@evaneschneider
Merge branch 'dev' into error-macro
71727de
@bcaddy
Update long time notification to provide more usefull output
5c22e14
@evazlimen
clang format
11ae481
@evaneschneider
Merge pull request #336 from mabruzzo/error-macro
ac06fe6 
Introduce new ``ERROR`` and ``ASSERT`` macros
@evaneschneider
Merge branch 'dev' into dev-clangTidyRunner
614565f
@evaneschneider
Merge pull request #337 from bcaddy/dev-clangTidyRunner
3662ba7 
Add script to run clang-tidy on all builds
@evaneschneider
Merge branch 'dev' into dev-findSlowGPUs
302f43a
@evaneschneider
Merge pull request #339 from bcaddy/dev-findSlowGPUs
a16558a 
Method to Identify Slow GPUs + Output bugfix
@helenarichie
Merge branch 'dev' into dev-clang-naming
f5846a6
@helenarichie
Merge branch 'dev' into dev-scalar-floor
c793c79
@helenarichie
Merge branch 'dev-scalar-floor' of github.com:helenarichie/cholla int…
4fda7e2 
…o dev-scalar-floor
@helenarichie
fix naming
229438d
Merge remote-tracking branch 'upstream/dev' into dev-static_grav-testing
1d39c35
@evaneschneider
hacky fix to get the cooling test build to compile
145f3ef
@evaneschneider
removed functions to address Issues 239 and 240
d8613ee
@mabruzzo
Resolve #278 - added "cholla" attribute to HDF5 header
3d22103 
This should help yt with identifying cholla snapshots.
@bcaddy
Enable hicpp-signed-bitwise clang-tidy check
ed4e8f6 
This check only failed in a few spots and it was with string literals
operating with an unsigned int type so I set the
IgnorePositiveIntegerLiterals option to true.
@bcaddy
Fix & Enable misc-confusable-identifiers check
d8ea428
@bcaddy
Enable namespace name case checking
8c9c990
@bcaddy
Enable several naming checks
bb0097a 
Enabled checks for
- macro definitions
- typdefs
- aliases
- enums
@bcaddy
Enable class naming check
568fd46 
The ClassCase does cover structs so I removed the struct case line
@bcaddy
Permanantly disable cppcoreguidelines-pro-bounds-constant-array-index
e8ad034 
While this would be a good check to have on it's just not feasible in
GPU code.
@bcaddy
Fix bad rebase
4b00f57
@bcaddy
Formatting
b8cc4b4
@bcaddy
fix bad rebase
258f8f4
@bcaddy
Fix a few checks that came up during rebasing
ef13273
@evaneschneider
clang-format 17
8af3cdc
@evaneschneider
Merge pull request #341 from mabruzzo/fix-issue-278
be2471f 
Resolve #278 - added ``"cholla"`` attribute to HDF5 header
@evaneschneider
Merge branch 'dev' of github.com:cholla-hydro/cholla into fix-issues-…
a9c8b25 
…239-240
@helenarichie
Merge branch 'dev' into dev-clang-naming
b1c2fba
bcaddy and others added 25 commits February 1, 2024 13:46
@bcaddy @helenarichie
Fix clang-tidy warning
ff09d5d
@bcaddy @helenarichie
Replace #warning with print to cerr
b458962 
Avoids issues with running clang-tidy in non-VL builds
@helenarichie
Merge branch 'dev' into dev-scalar-floor
35e327a
@evaneschneider
Merge pull request #359 from bcaddy/dev-iss232
d234978 
Set launch parameters of some high cost kernels automatically
@bcaddy
Remove deprecated CUDA macro
73816e4
@bcaddy
Fix typo in header guard
cebf4e7
@bcaddy
Formatting
5909554
@helenarichie
set default floor values in global.h and add warning
3e1c195
@helenarichie
Merge branch 'dev' into dev-scalar-floor
8e2c742
@mabruzzo
updated the python concatenation scripts to automatically detect whet…
4f695aa 
…her cholla files were written in a flat directory-structure or if files from different simulation cycles were written to separate directories
@evaneschneider
Merge pull request #360 from bcaddy/dev-iss241
5ff572c 
Remove Deprecated CUDA Macro
@mabruzzo
minor bugfix
d47d8dd
@helenarichie
Merge branch 'dev' into dev-scalar-floor
8610f35
@helenarichie
change warning message and tweak how the default floors are set
114f96b
@helenarichie
fix syntax errors
3eb2fb8
@helenarichie
run clang format
cede7f3
@evaneschneider
Merge pull request #363 from helenarichie/dev-scalar-floor
737d039 
Add scalar floor and refactor temperature and density floors
@mabruzzo
Modified the filenames that the system-tests search for.
472c001
@mabruzzo
fixing another test.
ca6019e
@mabruzzo
Fixing a small oversight with determining file names in system_tester
5fe2c5c
@mabruzzo
Merge branch 'dev' into individual_cycle_outdir
e951118
@evaneschneider
Merge pull request #367 from mabruzzo/individual_cycle_outdir
3db8f10 
Alter the default behavior for organizing outputs
@evaneschneider
resolved merge conflicts
93e55e1
@evaneschneider
deleted stray <<<<
9280c19
@evaneschneider
fix formatting error
ae75fe3
@brantr
Copy link
Collaborator

brantr commented Feb 2, 2024 •
edited
Loading

Currently in dev there are some mismatches between python_script/ example script filenames and what's described in the wiki. The python_script/ examples also don't work with the new output directory organization. While these are minor issues, they may prevent users from actually successfully using the data. I think these could be addressed with a quick pr to dev, or they could be changed with a pr to main after you merge dev.

@evaneschneider
Copy link
Collaborator Author

evaneschneider commented Feb 2, 2024 •
edited
Loading

Thanks Brant! It was our intention to make everything consistent with the new directory structure - can you flag which python scripts we missed? Also, which wiki pages?

@brantr
Copy link
Collaborator

brantr commented Feb 2, 2024

Well, the scripts are concat_3d_data.py and the 2D version -- earlier today I swear they were not updated, but I see it now somehow says they were updated yesterday. And I must have clicked on an old wiki or not refreshed because the revisions I wanted it says Helena made two weeks ago (again I checked this morning after notice of the dev->main PR). So apologies for the false alarm.

@evaneschneider
Copy link
Collaborator Author

No worries, I appreciate you taking a look! We've definitely been doing a lot of tidying the last couple of weeks. I'm going to go ahead and merge this PR, but feel free to submit issues about anything else you think should be addressed.

@evaneschneider evaneschneider merged commit 8478c9e into main Feb 2, 2024
12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@evaneschneider @brantr @bcaddy @evazlimen @helenarichie @mabruzzo @ojwg