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

RECONR #118

Open
wants to merge 70 commits into
base: release/v1.3.0
Choose a base branch
from
Open

RECONR #118

wants to merge 70 commits into from

Conversation

jlconlin
Copy link
Member

This Pull Request adds the modern RECONR module to NJOY21.

jlconlin and others added 30 commits November 4, 2019 17:14
@jlconlin
Doing a little cleanup.
149e5be
@jlconlin
Additional cleanup.
61d48aa
@jlconlin
Adding a bunch of tests.
825c9e8
@jlconlin
Merge branch 'master' into feature/RECONR
beaa152 
# Conflicts:
#	CMakeLists.txt
#	metaconfigure/description.json
@jlconlin
Updating CMake stuff.
49be84c
@jlconlin
Removing njoy21::Sequence, it was never used anyway.
a1eec7a
@jlconlin
Moving cycle function closer to where it is used.
a2ac204
@jlconlin
Doing some cleanup while trying to understand what is going on.
9321fee
@jlconlin
Adding first of modern stuff.
3e325c7
@jlconlin
Getting NJOY21 to actually call the modern component.
5383432 
But that modern component isn't done yet.
@jlconlin
Getting NJOY21 to create JSON object of lipservice output.
e16fbd5
@jlconlin
Adding RECONR submodule and making it call the module appropriately.
705b008
@jlconlin
Adding extra JSON argument to pass to modern routines.
0a070d9
@jlconlin
Now will 'move' JSON argument instead of passing vy value.
c060bce
@jlconlin
Merge branch 'master' into feature/RECONR
d0019b8 
# Conflicts:
#	CMakeLists.txt
#	src/njoy21.hpp
@jlconlin
Removing variant-adapter.
a9aa303
@jlconlin
Updating some submodules.
52bd449
@nathangibson14
First attempt at using FetchContent. Need to update other repositorie…
c3bf7a4 
…s, as metaconfigure isn't playing nice.
@nathangibson14
First working FetchContent rendition.
6a7672d
@nathangibson14
Added live/signature/local FetchContent options.
a61a338
@nathangibson14
Added unit testing to new build system
f05d8c2
@nathangibson14
Minor update to cmake files
420ab30
@nathangibson14
Removed legacy build system folders.
7524d84
@nathangibson14
Updated signature example.
797adf3
@nathangibson14
Merge branch 'build/fetchcontent' into feature/RECONR
d489d2d
@nathangibson14
Added back RECONR dependency.
1a8fdc9
@jlconlin
Fixing call to module.
86456ec
@jlconlin
Passing std::ostream to routines.
7d1c533
@jlconlin
Adding std::cerr to pass to modern routines.
16eedce
@jlconlin
Trying to get timing information.
be6bc52
@jlconlin
Making CommandLine test compile faster.
01ba303
@jlconlin
Updating RECONR branch to master.
c988cf3
@jlconlin
Merge branch 'release/v1.3.0' into feature/RECONR
1c3f9f7 
# Conflicts:
#	CMakeLists.txt
#	cmake/develop_dependencies.cmake
#	src/njoy21.hpp
#	src/njoy21/Driver/Factory/src/setupModernDirectory.hpp
#	src/njoy21/modern.hpp
#	src/njoy21/modern/Sequence/Factory.hpp
#	src/njoy21/modern/Sequence/Factory/src/parse.hpp
#	src/njoy21/modern/Sequence/routines.hpp
#	tests/47/CMakeLists.txt
#	tests/47/referenceTape45
#	tests/47/referenceTape47
#	tests/47/referenceTape55
#	tests/47/referenceTape57
#	tests/48/CMakeLists.txt
#	tests/49/CMakeLists.txt
#	tests/49/input
#	tests/49/referenceTape71
#	tests/50/CMakeLists.txt
#	tests/50/referenceTape33
#	tests/50/referenceTape34
#	tests/51/CMakeLists.txt
#	tests/51/referenceTape33
#	tests/51/referenceTape34
#	tests/52/CMakeLists.txt
#	tests/52/referenceTape33
#	tests/52/referenceTape34
#	tests/53/CMakeLists.txt
#	tests/53/referenceTape33
#	tests/53/referenceTape34
#	tests/54/CMakeLists.txt
#	tests/54/referenceTape33
#	tests/54/referenceTape34
@jlconlin
Merge branch 'release/v1.3.0' into feature/RECONR
2c5c508
@jlconlin
Updating inputs because modern RECONR can't do binary tapes.
d3ae2ee
@jlconlin jlconlin mentioned this pull request Jan 22, 2021
Draft
@jlconlin
Merge branch 'release/v1.3.0' into feature/RECONR
e116797
@jlconlin
Removing the first set of regression tests.
197cf68
@jlconlin
Removing more regression tests.
2c97e87
@jlconlin
Doing something.
5e337fd
@jlconlin
Updating resonanceReconstuction commit hash.
6dc3cbc
@jlconlin
Fixing a few typos on input decks.
83926e6
@jlconlin
Adding modern::Sequence test.
5109d9e
@jlconlin
Fixing Driver test with modern RECONR.
da3f194
@jlconlin
Adding some error messages.
09b06b6
@jlconlin
Trying to sync input file.
d0f1876
@jlconlin
Removing offset.
66f52aa
@jlconlin
Fixing an error in Test30 input.
83f31c5
@jlconlin
Adding some notes about what regression tests are being deleted.
86f0286
@jlconlin
Fixing error in input for Test35 with modern RECONR.
c760b09
@jlconlin
Updating regression tests with modern RECONR.
009b0fc
@jlconlin
Ignoring some tests.
fe85cc9
@jlconlin
Fixing bugs with Test20.
fd8cf31
@jlconlin
Ignoring Test30 as modern RECONR can't handle it.
d601ff9
@jlconlin
Improving message about ignored tests.
54e82e2
@jlconlin
Copy link
Member Author

The latest update 54e82e2 moves this Pull Request out of draft mode.

  • Tests have been update to reflect changes due to modern LEAPR and RECONR.
  • Eight tests have been deleted as the ENDF files they use are old (i.e., < ENDF/B-VII.0) and no longer supported. This is documented in the ReleaseNotes
  • Three tests have been ignored using cmake/CTestCustom.cmake

The attached RegressionTests.pdf shows the checks that have been done to try and identify what the changes are in the all the regression tests.

@jlconlin jlconlin changed the base branch from release/v1.2.0 to release/v1.3.0 March 18, 2021 15:11
@jlconlin jlconlin marked this pull request as ready for review March 18, 2021 15:12
@jlconlin jlconlin mentioned this pull request Mar 18, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@whaeck whaeck Awaiting requested review from whaeck

@nathangibson14 nathangibson14 Awaiting requested review from nathangibson14

At least 1 approving review is required to merge this pull request.

Assignees

@jlconlin jlconlin

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@jlconlin @nathangibson14