diff --git a/src/openmc_data/generate/generate_jeff33.py b/src/openmc_data/generate/generate_jeff33.py index e618227..43c4e8a 100755 --- a/src/openmc_data/generate/generate_jeff33.py +++ b/src/openmc_data/generate/generate_jeff33.py @@ -79,9 +79,11 @@ def main(): (base_endf, 'ENDF-B-VIII.0_atomic_relax.zip', 'e04d50098cb2a7e4fe404ec4071611cc'), ] + # TODO: these individual TENDL neutron file endpoints return 404 on the + # new tendl.imperial.ac.uk site. Re-enable once the files are available. tendl_files = [ - 'https://tendl.web.psi.ch/tendl_2019/neutron_file/C/C013/lib/endf/n-C013.tendl', - 'https://tendl.web.psi.ch/tendl_2019/neutron_file/O/O017/lib/endf/n-O017.tendl', + # 'https://tendl.imperial.ac.uk/tendl_2019/neutron_file/C/C013/lib/endf/n-C013.tendl', + # 'https://tendl.imperial.ac.uk/tendl_2019/neutron_file/O/O017/lib/endf/n-O017.tendl', ] neutron_dir = Path('endf6') diff --git a/src/openmc_data/other/convert_tendl_rand.py b/src/openmc_data/other/convert_tendl_rand.py index d68531c..57ffd7e 100755 --- a/src/openmc_data/other/convert_tendl_rand.py +++ b/src/openmc_data/other/convert_tendl_rand.py @@ -124,15 +124,15 @@ def main(): release_details = { "ENDF2017": { - "base_url": "https://tendl.web.psi.ch/tendl_2017/tar_files/", + "base_url": "https://tendl.imperial.ac.uk/tendl_2017/tar_files/", "ending": ".random.tgz", }, "ENDF2015": { - "base_url": "https://tendl.web.psi.ch/tendl_2015/tar_files/", + "base_url": "https://tendl.imperial.ac.uk/tendl_2015/tar_files/", "ending": ".random.tgz", }, "ACE2015": { - "base_url": "https://tendl.web.psi.ch/tendl_2015/tar_files/", + "base_url": "https://tendl.imperial.ac.uk/tendl_2015/tar_files/", "ending": ".10.2016.tgz", }, } diff --git a/src/openmc_data/urls.py b/src/openmc_data/urls.py index f6d19cd..660f9ce 100644 --- a/src/openmc_data/urls.py +++ b/src/openmc_data/urls.py @@ -3,7 +3,7 @@ "2015": { "neutron": { "ace": { - "base_url": "https://tendl.web.psi.ch/tendl_2015/tar_files/", + "base_url": "https://tendl.imperial.ac.uk/tendl_2015/tar_files/", "compressed_files": ["ACE-n.tgz"], "neutron_files": "neutron_file/*/*/lib/endf/*-n.ace", "metastables": "neutron_file/*/*/lib/endf/*m-n.ace", @@ -15,7 +15,7 @@ "2017": { "neutron": { "ace":{ - "base_url": "https://tendl.web.psi.ch/tendl_2017/tar_files/", + "base_url": "https://tendl.imperial.ac.uk/tendl_2017/tar_files/", "compressed_files": ["tendl17c.tar.bz2"], "neutron_files": "ace-17/*", "metastables": "ace-17/*m", @@ -27,7 +27,7 @@ "2019": { "neutron": { "ace": { - "base_url": "https://tendl.web.psi.ch/tendl_2019/tar_files/", + "base_url": "https://tendl.imperial.ac.uk/tendl_2019/tar_files/", "compressed_files": ["tendl19c.tar.bz2"], "neutron_files": "tendl19c/*", "metastables": "tendl19c/*m", @@ -39,7 +39,7 @@ "2021": { "neutron": { "ace": { - "base_url": "https://tendl.web.psi.ch/tendl_2021/tar_files/", + "base_url": "https://tendl.imperial.ac.uk/tendl_2021/tar_files/", "compressed_files": ["tendl21c.tar.bz2"], "neutron_files": "tendl21c/*", "metastables": "tendl21c/*m", @@ -51,7 +51,7 @@ "2023": { "neutron": { "endf": { - "base_url": "https://tendl.web.psi.ch/tendl_2023/tar_files/", + "base_url": "https://tendl.imperial.ac.uk/tendl_2023/tar_files/", "compressed_files": ["TENDL-n.2024new.tgz"], "endf_files": "n-*.tendl", "metastables": "n-*m.tendl", @@ -63,7 +63,7 @@ "2025": { "neutron": { "endf": { - "base_url": "https://tendl.web.psi.ch/tendl_2025/tar_files/", + "base_url": "https://tendl.imperial.ac.uk/tendl_2025/tar_files/", "compressed_files": ["TENDL-n.tgz"], "endf_files": "n-*.tendl", "metastables": "n-*m.tendl", diff --git a/src/openmc_data/urls_chain.py b/src/openmc_data/urls_chain.py index b54056c..5dba0c1 100644 --- a/src/openmc_data/urls_chain.py +++ b/src/openmc_data/urls_chain.py @@ -48,25 +48,25 @@ 'tendl': { '2015': { 'neutron':{ - 'base_url': 'https://tendl.web.psi.ch/tendl_2015/tar_files/', + 'base_url': 'https://tendl.imperial.ac.uk/tendl_2015/tar_files/', 'compressed_files': ['TENDL-n.tgz'], } }, '2017': { 'neutron':{ - 'base_url': 'https://tendl.web.psi.ch/tendl_2017/tar_files/', + 'base_url': 'https://tendl.imperial.ac.uk/tendl_2017/tar_files/', 'compressed_files': ['TENDL-n.tgz'], } }, '2019': { 'neutron':{ - 'base_url': 'https://tendl.web.psi.ch/tendl_2019/tar_files/', + 'base_url': 'https://tendl.imperial.ac.uk/tendl_2019/tar_files/', 'compressed_files': ['TENDL-n.tgz'], } }, '2021': { 'neutron':{ - 'base_url': 'https://tendl.web.psi.ch/tendl_2021/tar_files/', + 'base_url': 'https://tendl.imperial.ac.uk/tendl_2021/tar_files/', 'compressed_files': ['TENDL-n.tgz'], } } diff --git a/src/openmc_data/urls_h5.py b/src/openmc_data/urls_h5.py index 6d2c02e..f88054b 100644 --- a/src/openmc_data/urls_h5.py +++ b/src/openmc_data/urls_h5.py @@ -20,7 +20,7 @@ "tendl": { "2019": { "neutron": { - "base_url": "https://tendl.web.psi.ch/tendl_2019/tar_files/", + "base_url": "https://tendl.imperial.ac.uk/tendl_2019/tar_files/", "compressed_files": ["tendl19_hdf5.tar.bz2"], "compressed_file_size": 1.3, "uncompressed_file_size": 2.5, @@ -28,7 +28,7 @@ }, "2021": { "neutron": { - "base_url": "https://tendl.web.psi.ch/tendl_2021/tar_files/", + "base_url": "https://tendl.imperial.ac.uk/tendl_2021/tar_files/", "compressed_files": ["tendl21_hdf5.tar.bz2"], "compressed_file_size": 1.3, "uncompressed_file_size": 2.5,