Skip to content

Commit be44bc2

Browse files
committed
Merge branch 'feature/covariances' into 'develop'
Feature/covariances See merge request njoy/dryad!8
2 parents c3b638f + aac3f7e commit be44bc2

7 files changed

+11
-5
lines changed

cmake/dependencies.cmake

+5-5
Original file line numberDiff line numberDiff line change
@@ -15,22 +15,22 @@ set( CMAKE_EXPORT_NO_PACKAGE_REGISTRY ON )
1515

1616
FetchContent_Declare( tools
1717
GIT_REPOSITORY ../../njoy/tools
18-
GIT_TAG 7124bbfc746a9fa0e37a2c1e4a8eb019ddec9f02 # tag: v0.4.1
18+
GIT_TAG 204c0cf81eab97f51d3f8372c69fcdfd073ce60b # tag: v0.4.2
1919
)
2020

2121
FetchContent_Declare( scion
2222
GIT_REPOSITORY ../../njoy/scion
23-
GIT_TAG eab5ad3b3344ee5d982cde1ebae52103aa6e694e # NOT A RELEASED VERSION - CHANGE ME!
23+
GIT_TAG a6bac01b587aed6eea469cffd79a448473f6098c # NOT A RELEASED VERSION - CHANGE ME!
2424
)
2525

2626
FetchContent_Declare( ACEtk
2727
GIT_REPOSITORY ../../njoy/ACEtk
28-
GIT_TAG 8e075b597dd0b9893536f0d0f23dcec11fd36c7c # NOT A RELEASED VERSION - CHANGE ME!
28+
GIT_TAG 5fdd3cf9c3082633c9edd229c4dc5d9d5577246f # NOT A RELEASED VERSION - CHANGE ME!
2929
)
3030

3131
FetchContent_Declare( ENDFtk
3232
GIT_REPOSITORY ../../njoy/ENDFtk
33-
GIT_TAG 4ed1dae3a12160ff1323b498525e568105436895 # NOT A RELEASED VERSION - CHANGE ME!
33+
GIT_TAG 01745c4a715e0c9750674b5a9453eb4a25a4fd49 # NOT A RELEASED VERSION - CHANGE ME!
3434
)
3535

3636
#######################################################################
@@ -40,7 +40,7 @@ FetchContent_Declare( ENDFtk
4040
if(dryad.python)
4141
FetchContent_Declare( pybind11
4242
GIT_REPOSITORY ../../pybind/pybind11
43-
GIT_TAG 5b0a6fc2017fcc176545afe3e09c9f9885283242 # tag: v2.10.4
43+
GIT_TAG a2e59f0e7065404b44dfe92a28aca47ba1378dc4 # tag: v2.13.6
4444
)
4545
FetchContent_MakeAvailable(
4646
pybind11

src/dryad/AtomicRelaxation.hpp

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
#define NJOY_DRYAD_ATOMICRELAXATION
33

44
// system includes
5+
#include <algorithm>
56
#include <vector>
67

78
// other includes

src/dryad/ProjectileTarget.hpp

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
#define NJOY_DRYAD_PROJECTILETARGET
33

44
// system includes
5+
#include <algorithm>
56
#include <vector>
67

78
// other includes

src/dryad/Reaction.hpp

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
#define NJOY_DRYAD_REACTION
33

44
// system includes
5+
#include <algorithm>
56
#include <optional>
67
#include <variant>
78
#include <vector>

src/dryad/format/gnds/atomic/createElectronSubshellID.hpp

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
#define NJOY_DRYAD_FORMAT_GNDS_ATOMIC_CREATEELECTRONSUBSHELLID
33

44
// system includes
5+
#include <algorithm>
56
#include <vector>
67

78
// other includes

src/dryad/format/gnds/convertCrossSections.hpp

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
#define NJOY_DRYAD_FORMAT_GNDS_CONVERTCROSSSECTIONS
33

44
// system includes
5+
#include <algorithm>
56
#include <vector>
67

78
// other includes

src/dryad/format/gnds/createReactions.hpp

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
#define NJOY_DRYAD_FORMAT_GNDS_CREATEREACTIONS
33

44
// system includes
5+
#include <algorithm>
56
#include <vector>
67

78
// other includes

0 commit comments

Comments
 (0)