Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
785febe
Rejig library config for AM3
Whyborn May 22, 2026
5e0bd5a
Add library manifests to CI
Whyborn May 22, 2026
5ea70cd
Add library manifests to CI
Whyborn May 22, 2026
1bdd923
Set ref for spack-packages
Whyborn May 22, 2026
3cb4057
Remove templates taken from spack-packages
Whyborn May 22, 2026
329c302
Fix quotes
Whyborn May 22, 2026
4a692ca
Misspelled matches
Whyborn May 22, 2026
395b1fa
Move some files to common library
Whyborn May 22, 2026
d033810
Add type files to library
Whyborn May 22, 2026
f84c396
Fix some file names
Whyborn May 25, 2026
fea2e45
Fix more file names
Whyborn May 25, 2026
b5e9b4d
Drop coupled namelists mod
Whyborn May 25, 2026
367ba2f
Add surface types mod
Whyborn May 26, 2026
878632d
Fix name
Whyborn May 26, 2026
114cf54
use new cable_surface_types_mod.F90
Whyborn May 26, 2026
cb6ac5c
Wrong end subroutine name
Whyborn May 26, 2026
26c5d59
Add stash mapping
Whyborn May 26, 2026
8b94bfb
Add ncpft back
Whyborn May 26, 2026
6f9b9b0
Add dimension declaration
Whyborn May 26, 2026
0bd7975
Remove CASA IO from library
Whyborn May 26, 2026
de283d4
Readd landuse
Whyborn May 26, 2026
921abd5
Fix file name
Whyborn May 26, 2026
feb632b
Add cable_iovars.F90 to the build with slight adjustment
Whyborn May 27, 2026
dc432f7
Readd casa_inout
Whyborn May 27, 2026
4813a19
Library now builds
Whyborn May 27, 2026
911c2b3
Remove casa_variable.F90 from library
Whyborn May 28, 2026
f5662be
Add all the CASA types
Whyborn May 28, 2026
c6fe3e5
Update CASA types
Whyborn May 28, 2026
8d4ebc6
Use new cable_surface_types_mod.F90
Whyborn May 29, 2026
6d8f1a1
Fix dummy argument intents
Whyborn May 29, 2026
2ebc5da
Accidental doubly defined argument
Whyborn May 29, 2026
a01f924
Fix typos
Whyborn Jun 1, 2026
4d68181
Remove IFDEF statement
Whyborn Jun 2, 2026
7a6d2e2
Remove duplicate files
Whyborn Jun 2, 2026
3d0312a
Set ncpft
Whyborn Jun 2, 2026
a892c05
Remove coupled version of cable_surface_types
Whyborn Jun 12, 2026
39fc220
Fix name error
Whyborn Jun 12, 2026
cd3747d
Update cable_user and CMakeLists.txt
Whyborn Jun 16, 2026
1c1e944
Include ESM1.5 version of casa_landuse
Whyborn Jun 17, 2026
aaba5ca
Add missing file
Whyborn Jun 17, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions .github/build-ci/manifests/library-gcc.spack.yaml.j2
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
spack:
specs:
# package is defined in the workflows inputs.spack-manifest-data-pairs
# gcc_compiler_ver is defined in the standard_definitions.json data file
- cable@git.{{ ref }} +mpi library=access3
- cable@git.{{ ref }} ~mpi library=access3
packages:
gcc:
require:
- '@13.2.0'
all:
require:
- '%access_gcc'
- target=x86_64
concretizer:
unify: false
view: false
17 changes: 17 additions & 0 deletions .github/build-ci/manifests/library-intel.spack.yaml.j2
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
spack:
specs:
# package is defined in the workflows inputs.spack-manifest-data-pairs
# intel_compiler_ver is defined in the standard_definitions.json data file
- cable@git.{{ ref }} +mpi library=access3
- cable@git.{{ ref }} ~mpi library=access3
packages:
intel-oneapi-compilers-classic:
require:
- '@2021.10.0'
all:
require:
- '%access_intel'
- target=x86_64
concretizer:
unify: false
view: false
3 changes: 3 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,15 @@ jobs:
spack-manifest-path:
- .github/build-ci/manifests/gcc.spack.yaml.j2
- .github/build-ci/manifests/intel.spack.yaml.j2
- .github/build-ci/manifests/library-gcc.spack.yaml.j2
- .github/build-ci/manifests/library-intel.spack.yaml.j2
uses: access-nri/build-ci/.github/workflows/ci.yml@v3
with:
# For defaults for args not specified here (eg. spack/packages/config refs), see https://github.com/ACCESS-NRI/build-ci/blob/v3/.github/workflows/README.md
spack-manifest-path: ${{ matrix.spack-manifest-path }}
# We need to install the compilers manually here because the upstream image is too large to run on GitHub-hosted runners
spack-compiler-manifest-path: .github/build-ci/compilers/spack.yaml
access-spack-packages-ref: 1d9acf45c39229ff4e90a9aa49922b1169305476
allow-ssh-into-spack-install: false
spack-oci-buildcache-url: oci://ghcr.io/CABLE-LSM/build-ci-buildcache # https://github.com/orgs/CABLE-LSM/packages/container/package/build-ci-buildcache
# Since CABLE-LSM can't access ACCESS-NRI's self-hosted runners, we use a GitHub-hosted version
Expand Down
57 changes: 47 additions & 10 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -88,17 +88,11 @@ if(CABLE_LIBRARY)
src/science/casa-cnp/bgcdriver.F90
src/science/casa-cnp/biogeochem_casa.F90
src/science/casa-cnp/casa_cnp.F90
src/science/casa-cnp/casa_dimension.F90
src/science/casa-cnp/casa_feedback.F90
src/science/casa-cnp/casa_inout.F90
src/science/casa-cnp/casa_param.F90
src/science/casa-cnp/casa_phenology.F90
src/science/casa-cnp/casa_readbiome.F90
src/science/casa-cnp/casa_rplant.F90
src/science/casa-cnp/casa_sumcflux.F90
src/science/casa-cnp/casa_variable.F90
src/science/landuse/landuse3.F90
src/science/landuse/landuse_constant.F90
src/science/misc/cable_air.F90
src/science/misc/cable_carbon.F90
src/science/misc/cable_climate.F90
Expand Down Expand Up @@ -132,17 +126,15 @@ if(CABLE_LIBRARY)
src/science/soilsnow/cbl_surfbv.F90
src/science/soilsnow/cbl_thermal.F90
src/science/soilsnow/cbl_trimb.F90
src/science/landuse/landuse3.F90
src/science/landuse/landuse_constant.F90
src/params/cable_phys_constants_mod.F90
src/params/grid_constants_cbl.F90
src/params/cable_photo_constants_mod.F90
src/params/cable_other_constants_mod.F90
src/params/cable_maths_constants_mod.F90
src/util/cable_runtime_opts_mod.F90
src/util/cable_common.F90
src/coupled/shared/cable_canopy_type_mod.F90
src/coupled/shared/cable_soilsnow_type_mod.F90
src/coupled/shared/cable_soil_type_mod.F90
src/coupled/shared/cable_veg_type_mod.F90
src/util/cable_climate_type_mod.F90
src/util/masks_cbl.F90
)
Expand All @@ -156,6 +148,10 @@ if(CABLE_LIBRARY)
src/coupled/esm/cable_pft_params_mod.F90
src/coupled/esm/casa_landuse.F90
src/coupled/esm/LAI_canopy_height_cbl.F90
src/coupled/shared/cable_canopy_type_mod.F90
src/coupled/shared/cable_soilsnow_type_mod.F90
src/coupled/shared/cable_soil_type_mod.F90
src/coupled/shared/cable_veg_type_mod.F90
)
if(CMAKE_Fortran_COMPILER_ID MATCHES "Intel")
add_compile_options(-r8 -i8)
Expand All @@ -165,6 +161,47 @@ if(CABLE_LIBRARY)
message(STATUS "Cannot compile library with unknown compiler")
endif()

elseif(CABLE_LIBRARY_TARGET STREQUAL "access3")
list(APPEND SOURCES
src/coupled/AM3/control/cable/CM3/air_type_cbl.F90
src/coupled/AM3/control/cable/CM3/balances_type_cbl.F90
src/coupled/AM3/control/cable/CM3/bgc_pool_type.F90
src/coupled/AM3/control/cable/CM3/cable_define_types.F90
src/coupled/AM3/control/cable/CM3/cbl_canopy_type.F90
src/coupled/AM3/control/cable/CM3/cbl_cbm_mod.F90
src/coupled/AM3/control/cable/CM3/climate_type.F90
src/coupled/AM3/control/cable/CM3/met_type_cbl.F90
src/coupled/AM3/control/cable/CM3/radiation_type.F90
src/coupled/AM3/control/cable/CM3/roughness_type.F90
src/coupled/AM3/control/cable/CM3/soil_type_cbl.F90
src/coupled/AM3/control/cable/CM3/ssnow_type.F90
src/coupled/AM3/control/cable/CM3/sum_flux_type.F90
src/coupled/AM3/control/cable/CM3/veg_type.F90
src/coupled/AM3/control/casa/types/casa_balance_type.F90
src/coupled/AM3/control/casa/types/casa_biome_type.F90
src/coupled/AM3/control/casa/types/casa_files_type.F90
src/coupled/AM3/control/casa/types/casa_flux_type.F90
src/coupled/AM3/control/casa/types/casa_met_type.F90
src/coupled/AM3/control/casa/types/casa_phenology_type.F90
src/coupled/AM3/control/casa/types/casa_pool_type.F90
src/coupled/AM3/control/casa/types/sum_casa_flux_type.F90
src/coupled/AM3/control/casa/types/sum_casa_pool_type.F90
src/coupled/AM3/control/casa/types/casa_variable.F90
src/coupled/AM3/control/casa/types/phen_variable.F90
src/coupled/AM3/control/casa/types/casa_dimension.F90
src/coupled/AM3/control/casa/types/casa_inout.F90
src/coupled/AM3/control/casa/types/casa_readbiome.F90
src/offline/cable_surface_types.F90
src/offline/cable_iovars.F90
src/science/landuse/casa_ESM15landuse.F90
)
if (CMAKE_Fortran_COMPILER_ID MATCHES "Intel")
add_compile_options(-r8 -i8)
elseif(CMAKE_Fortran_COMPILER_ID MATCHES "GNU")
add_compile_options(-fdefault-real-8 -fdefault-integer-8 -fdefault-double-8)
else()
message(STATUS "Cannot compile library with unknown compiler")
endif()
else()
message(STATUS "Specified library application does not exist")
endif()
Expand Down
Loading
Loading