diff --git a/COPYRIGHT.md b/COPYRIGHT.md index 0d0a879..238a897 100644 --- a/COPYRIGHT.md +++ b/COPYRIGHT.md @@ -1,11 +1,28 @@ # Copyright and attribution -This repository contains code from two sources, both under the BSD 3-Clause -licence in `LICENCE`. +This repository contains code under two licences. `NOTICE` is the +distribution-facing summary; this file is the map. + +## New Python/JAX code — `src/`, `tests/`, `validation/`, `docs/` + +Copyright (c) 2026 Reflective, released under the **Apache License 2.0** +(`LICENCE`). + +Exception: the Fortran under `validation/` — the f2py shim modules in +`validation/f2py/` and the overlay patches in `validation/patches/` — is +BSD 3-Clause, per its file headers; see below. + +The port is written from the vendored Fortran — the repo's own rule is "port +from the code, not the comments" — so it is treated as a derivative work of +the BSD-licensed source, and every distribution of it (source or wheel) +carries the BSD notice via `NOTICE`. BSD 3-Clause permits derivatives under a +different licence provided the notice, conditions and disclaimer are +retained; that is what `tests/test_licensing.py` enforces. ## Vendored Fortran — `fortran/` -Crown Copyright (c) Met Office, with contributions by the University of Leeds. +Crown Copyright (c) Met Office, with contributions by the University of +Leeds, under the **BSD 3-Clause licence** (`fortran/LICENCE`). `fortran/` is a copy of the UKCA GLOMAP-mode aerosol microphysics and a standalone box driver, taken from @@ -15,14 +32,13 @@ file retains its original copyright header. The GLOMAP science routines additionally carry `(c) [University of Leeds] [2008]`, licensed to the Met Office under the UKCA collaboration agreement. -See `PROVENANCE.md` for the exact upstream commit and the file-by-file origin. - -## New Python/JAX code — `src/`, `tests/`, `validation/`, `scripts/`, `benchmarks/` +`fortran/src/box/`, the overlay extensions in `validation/patches/`, and the +f2py shims in `validation/f2py/` are new code, Copyright (c) 2026 Reflective, +kept under the **same BSD 3-Clause licence** deliberately: the box driver +stays comparable with `glomap-box`, and the Fortran-side extensions are +drafted for upstreaming there. -Copyright (c) 2026 Reflective, released under the same BSD 3-Clause licence. - -This is a reimplementation, not a translation of copied text: it is written -against the Fortran's published behaviour and validated against it numerically. +See `PROVENANCE.md` for the exact upstream commit and the file-by-file origin. ## No endorsement diff --git a/LICENCE b/LICENCE index 5f36cd7..d645695 100644 --- a/LICENCE +++ b/LICENCE @@ -1,28 +1,202 @@ -BSD 3-Clause Licence - -Crown Copyright (c) Met Office - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - -1. Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - -2. Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - -3. Neither the name of the copyright holder nor the names of its - contributors may be used to endorse or promote products derived from - this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/NOTICE b/NOTICE new file mode 100644 index 0000000..603bcb7 --- /dev/null +++ b/NOTICE @@ -0,0 +1,51 @@ +GLOMAP-JAX +Copyright (c) 2026 Reflective + +Licensed under the Apache License, Version 2.0 (see LICENCE). + +-------------------------------------------------------------------------- + +This project is a derivative of, and is validated against, the UKCA +GLOMAP-mode aerosol microphysics: + + Crown Copyright (c) Met Office + with contributions (c) University of Leeds + +vendored under fortran/ and redistributed under the BSD 3-Clause licence +(see fortran/LICENCE, reproduced below). The standalone box-model driver +under fortran/src/box/ and its overlay extensions are (c) 2026 Reflective, +also under BSD 3-Clause. See PROVENANCE.md for the exact upstream commit. + +Not affiliated with, endorsed by, or an official product of the Met Office, +NCAS, or the University of Leeds. + +-------------------------------------------------------------------------- + +BSD 3-Clause Licence + +Crown Copyright (c) Met Office + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +3. Neither the name of the copyright holder nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/PROVENANCE.md b/PROVENANCE.md index 037eadc..9b44e63 100644 --- a/PROVENANCE.md +++ b/PROVENANCE.md @@ -10,7 +10,7 @@ Fortran is attributable to the port, never to a local edit. | upstream commit | `387c5bb0f1166e67f029930ba624bf159bc68627` | | intermediate | `https://github.com/reflective-org/glomap-box` @ `2befe04` | | UKCA files vendored | 46 (44 byte-identical to upstream, 2 patched) | -| licence | BSD 3-Clause, Crown Copyright Met Office (see `LICENCE`) | +| licence | BSD 3-Clause, Crown Copyright Met Office (see `fortran/LICENCE`) | ## What is and is not editable diff --git a/README.md b/README.md index 53da6c4..88206e3 100644 --- a/README.md +++ b/README.md @@ -8,9 +8,10 @@ Work in progress. See `docs/` for the port plan and validation strategy. ## Licence and attribution -BSD 3-Clause. Vendored UKCA Fortran under `fortran/` is Crown Copyright (c) Met -Office with University of Leeds contributions; new Python/JAX code is Copyright -(c) Reflective, under the same licence. See `LICENCE` and `COPYRIGHT.md`. +New Python/JAX code is Copyright (c) Reflective under the Apache License 2.0 +(`LICENCE`). Vendored UKCA Fortran under `fortran/` is Crown Copyright (c) Met +Office with University of Leeds contributions, under BSD 3-Clause +(`fortran/LICENCE`). See `NOTICE` and `COPYRIGHT.md`. **Not affiliated with, endorsed by, or an official product of the Met Office, NCAS, or the University of Leeds.** diff --git a/docs/index.md b/docs/index.md index d9775c8..2d2f7f9 100644 --- a/docs/index.md +++ b/docs/index.md @@ -23,8 +23,8 @@ Order 1 (faithful port) in progress. See `PROGRESS.md` in the repository root. ## Licence -BSD 3-Clause. Vendored Fortran is Crown Copyright Met Office with University of -Leeds contributions; see `COPYRIGHT.md`. +Apache 2.0 for the port; vendored Fortran is Crown Copyright Met Office with +University of Leeds contributions under BSD 3-Clause. See `COPYRIGHT.md`. **Not affiliated with, endorsed by, or an official product of the Met Office, NCAS, or the University of Leeds.** diff --git a/pyproject.toml b/pyproject.toml index 18a350c..aac267f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,6 @@ [build-system] -requires = ["hatchling"] +# >=1.27 for PEP 639 licence expressions and license-files +requires = ["hatchling>=1.27"] build-backend = "hatchling.build" [project] @@ -7,7 +8,10 @@ name = "glomap-jax" version = "0.1.0" description = "Differentiable GLOMAP-mode aerosol microphysics in Python/JAX, ported faithfully from the UKCA Fortran" readme = "README.md" -license = { file = "LICENCE" } +license = "Apache-2.0" +# Ships the Apache text, the Met Office BSD notice, and the NOTICE that +# reproduces it into every wheel and sdist (BSD-3 clause 2). +license-files = ["LICENCE", "NOTICE", "fortran/LICENCE"] authors = [{ name = "Ali Akherati", email = "ali@reflective.org" }] requires-python = ">=3.11" dependencies = [ diff --git a/tests/test_licensing.py b/tests/test_licensing.py index 9fab063..4daab38 100644 --- a/tests/test_licensing.py +++ b/tests/test_licensing.py @@ -23,8 +23,18 @@ def _read(name: str) -> str: return path.read_text(encoding="utf-8") -def test_licence_is_bsd_3_clause_with_crown_copyright(): +def test_root_licence_is_apache_2(): + """Fails if the outbound licence is reverted to BSD-3 or truncated.""" text = _read("LICENCE") + assert "Apache License" in text + assert "Version 2.0, January 2004" in text + # The last section of the terms -- gone if the text is truncated. + assert "9. Accepting Warranty or Additional Liability" in text + + +def test_fortran_licence_is_bsd_3_clause_with_crown_copyright(): + """Fails if a re-vendor drops the BSD notice that clause 1 obliges us to keep.""" + text = _read("fortran/LICENCE") assert "BSD 3-Clause" in text assert "Crown Copyright (c) Met Office" in text # Clause 3 must be present verbatim -- it is what forbids implying endorsement. @@ -35,14 +45,43 @@ def test_readme_carries_the_no_endorsement_disclaimer(): assert DISCLAIMER in _read("README.md") +def test_notice_carries_bsd_attribution_verbatim(): + """Fails if NOTICE is deleted, or its BSD reproduction drifts from + fortran/LICENCE -- clause 2 requires the notice, conditions and + disclaimer verbatim, not a paraphrase.""" + text = _read("NOTICE") + assert "Copyright (c) 2026 Reflective" in text + assert DISCLAIMER in text + # The whole BSD licence must appear, byte-for-byte as vendored. + assert _read("fortran/LICENCE").strip() in text + + def test_copyright_file_separates_vendored_from_new_code(): + """Fails if COPYRIGHT.md loses either licence, either owner, or the + disclaimer -- e.g. a rewrite that describes the repo as single-licence.""" text = _read("COPYRIGHT.md") + assert "Apache License 2.0" in text + assert "BSD 3-Clause" in text assert "Crown Copyright (c) Met Office" in text assert "University of Leeds" in text assert "Reflective" in text assert DISCLAIMER in text +def test_pyproject_ships_both_licences_in_distributions(): + """Fails if a packaging edit stops wheels/sdists carrying the BSD notice + (clause 2) or the Apache text alongside the code.""" + import tomllib + + with open(REPO / "pyproject.toml", "rb") as f: + project = tomllib.load(f)["project"] + assert project["license"] == "Apache-2.0" + licence_files = project["license-files"] + for name in ["LICENCE", "NOTICE", "fortran/LICENCE"]: + assert name in licence_files, f"{name} missing from license-files" + assert (REPO / name).is_file(), f"{name} listed but absent" + + def test_provenance_records_the_upstream_commit(): text = _read("PROVENANCE.md") # The full hash, not a prefix: goldens are only meaningful against a known diff --git a/validation/f2py/glomap_budidx_mod.F90 b/validation/f2py/glomap_budidx_mod.F90 index ba1b7ee..993f3da 100644 --- a/validation/f2py/glomap_budidx_mod.F90 +++ b/validation/f2py/glomap_budidx_mod.F90 @@ -1,6 +1,6 @@ ! *****************************COPYRIGHT******************************* ! (c) 2026. Validation instrumentation for the GLOMAP-JAX port. -! New code, BSD 3-Clause (see LICENCE). Not part of UKCA. +! New code, BSD 3-Clause (see fortran/LICENCE). Not part of UKCA. ! *****************************COPYRIGHT******************************* ! ! Description: diff --git a/validation/f2py/glomap_coagmode_mod.F90 b/validation/f2py/glomap_coagmode_mod.F90 index 57ee3ce..520c3bf 100644 --- a/validation/f2py/glomap_coagmode_mod.F90 +++ b/validation/f2py/glomap_coagmode_mod.F90 @@ -1,6 +1,6 @@ ! *****************************COPYRIGHT******************************* ! (c) 2026. Validation instrumentation for the GLOMAP-JAX port. -! New code, BSD 3-Clause (see LICENCE). Not part of UKCA. +! New code, BSD 3-Clause (see fortran/LICENCE). Not part of UKCA. ! *****************************COPYRIGHT******************************* ! ! Description: diff --git a/validation/f2py/glomap_ereport_shim.F90 b/validation/f2py/glomap_ereport_shim.F90 index 6f66aa3..864cdda 100644 --- a/validation/f2py/glomap_ereport_shim.F90 +++ b/validation/f2py/glomap_ereport_shim.F90 @@ -1,6 +1,6 @@ ! *****************************COPYRIGHT******************************* ! (c) 2026. Validation instrumentation for the GLOMAP-JAX port. -! New code, BSD 3-Clause (see LICENCE). Not part of UKCA. +! New code, BSD 3-Clause (see fortran/LICENCE). Not part of UKCA. ! *****************************COPYRIGHT******************************* ! ! Description: diff --git a/validation/f2py/glomap_f2py_mod.F90 b/validation/f2py/glomap_f2py_mod.F90 index 2209a6e..64f962a 100644 --- a/validation/f2py/glomap_f2py_mod.F90 +++ b/validation/f2py/glomap_f2py_mod.F90 @@ -1,6 +1,6 @@ ! *****************************COPYRIGHT******************************* ! (c) 2026. Validation instrumentation for the GLOMAP-JAX port. -! New code, BSD 3-Clause (see LICENCE). Not part of UKCA. +! New code, BSD 3-Clause (see fortran/LICENCE). Not part of UKCA. ! *****************************COPYRIGHT******************************* ! ! Description: diff --git a/validation/f2py/glomap_f2py_state_mod.F90 b/validation/f2py/glomap_f2py_state_mod.F90 index e7c5ee5..fe78bfa 100644 --- a/validation/f2py/glomap_f2py_state_mod.F90 +++ b/validation/f2py/glomap_f2py_state_mod.F90 @@ -1,6 +1,6 @@ ! *****************************COPYRIGHT******************************* ! (c) 2026. Validation instrumentation for the GLOMAP-JAX port. -! New code, BSD 3-Clause (see LICENCE). Not part of UKCA. +! New code, BSD 3-Clause (see fortran/LICENCE). Not part of UKCA. ! *****************************COPYRIGHT******************************* ! ! Description: diff --git a/validation/f2py/glomap_gasidx_mod.F90 b/validation/f2py/glomap_gasidx_mod.F90 index 8dd5296..d0df53b 100644 --- a/validation/f2py/glomap_gasidx_mod.F90 +++ b/validation/f2py/glomap_gasidx_mod.F90 @@ -1,6 +1,6 @@ ! *****************************COPYRIGHT******************************* ! (c) 2026. Validation instrumentation for the GLOMAP-JAX port. -! New code, BSD 3-Clause (see LICENCE). Not part of UKCA. +! New code, BSD 3-Clause (see fortran/LICENCE). Not part of UKCA. ! *****************************COPYRIGHT******************************* ! ! Description: diff --git a/validation/f2py/glomap_leaf_mod.F90 b/validation/f2py/glomap_leaf_mod.F90 index b983aed..dd4bdf6 100644 --- a/validation/f2py/glomap_leaf_mod.F90 +++ b/validation/f2py/glomap_leaf_mod.F90 @@ -1,6 +1,6 @@ ! *****************************COPYRIGHT******************************* ! (c) 2026. Validation instrumentation for the GLOMAP-JAX port. -! New code, BSD 3-Clause (see LICENCE). Not part of UKCA. +! New code, BSD 3-Clause (see fortran/LICENCE). Not part of UKCA. ! *****************************COPYRIGHT******************************* ! ! Description: diff --git a/validation/f2py/glomap_modes_mod.F90 b/validation/f2py/glomap_modes_mod.F90 index 7bdf779..df34e31 100644 --- a/validation/f2py/glomap_modes_mod.F90 +++ b/validation/f2py/glomap_modes_mod.F90 @@ -1,6 +1,6 @@ ! *****************************COPYRIGHT******************************* ! (c) 2026. Validation instrumentation for the GLOMAP-JAX port. -! New code, BSD 3-Clause (see LICENCE). Not part of UKCA. +! New code, BSD 3-Clause (see fortran/LICENCE). Not part of UKCA. ! *****************************COPYRIGHT******************************* ! ! Description: diff --git a/validation/patches/0003-dump-state.patch b/validation/patches/0003-dump-state.patch index f9e10ff..76917aa 100644 --- a/validation/patches/0003-dump-state.patch +++ b/validation/patches/0003-dump-state.patch @@ -87,7 +87,7 @@ diff --color -ruN a/src/box/glomap_dump_mod.F90 b/src/box/glomap_dump_mod.F90 @@ -0,0 +1,98 @@ +! *****************************COPYRIGHT******************************* +! (c) 2026. Validation instrumentation for the GLOMAP-JAX port. -+! New code, BSD 3-Clause (see LICENCE). Not part of UKCA. ++! New code, BSD 3-Clause (see fortran/LICENCE). Not part of UKCA. +! *****************************COPYRIGHT******************************* +! +! Description: diff --git a/validation/patches/0004-dump-branches.patch b/validation/patches/0004-dump-branches.patch index c6d252c..0b256c2 100644 --- a/validation/patches/0004-dump-branches.patch +++ b/validation/patches/0004-dump-branches.patch @@ -119,7 +119,7 @@ diff --color -ruN a/src/box/glomap_branch_mod.F90 b/src/box/glomap_branch_mod.F9 @@ -0,0 +1,135 @@ +! *****************************COPYRIGHT******************************* +! (c) 2026. Validation instrumentation for the GLOMAP-JAX port. -+! New code, BSD 3-Clause (see LICENCE). Not part of UKCA. ++! New code, BSD 3-Clause (see fortran/LICENCE). Not part of UKCA. +! *****************************COPYRIGHT******************************* +! +! Description: