From 15fb8f032f3f352b76e42fc2ab21399897eb3c36 Mon Sep 17 00:00:00 2001 From: dougiesquire Date: Wed, 16 Apr 2025 15:45:10 +1000 Subject: [PATCH 1/3] Include access/shared for all ACCESS build types --- exp/MOM_compile.csh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/exp/MOM_compile.csh b/exp/MOM_compile.csh index a2d05543c..79e522a33 100755 --- a/exp/MOM_compile.csh +++ b/exp/MOM_compile.csh @@ -264,7 +264,7 @@ else exit 1 endif -if( $type == ACCESS-OM || $type == ACCESS-ESM) then +if( $type =~ ACCESS-* ) then set srcList = ( $srcList access/shared ) endif From 6df30840a85689bb5bae8bbf90873d56176719bd Mon Sep 17 00:00:00 2001 From: dougiesquire Date: Wed, 16 Apr 2025 15:46:15 +1000 Subject: [PATCH 2/3] Remove access generic_tracers git submodule --- src/access/README.md | 6 ------ src/access/generic_tracers | 1 - 2 files changed, 7 deletions(-) delete mode 160000 src/access/generic_tracers diff --git a/src/access/README.md b/src/access/README.md index 837f11769..93156cb32 100644 --- a/src/access/README.md +++ b/src/access/README.md @@ -1,9 +1,3 @@ # ACCESS-specific code This directory includes code that is specific to ACCESS-models. - -[ACCESS-specific generic tracers](https://github.com/ACCESS-NRI/GFDL-generic-tracers) are included as a git submodule. To retrieve the code for the submodule run: - -```bash -git submodule update --init --recursive -``` diff --git a/src/access/generic_tracers b/src/access/generic_tracers deleted file mode 160000 index 6dcadbbae..000000000 --- a/src/access/generic_tracers +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 6dcadbbaef22c8c7b20f7ed5cf75df37dbade3b8 From be7047af8686d7d057b9779a1f06c9559f08c7dd Mon Sep 17 00:00:00 2001 From: dougiesquire Date: Thu, 17 Apr 2025 11:25:42 +1000 Subject: [PATCH 3/3] Allocate IOB arrays for nitrate and algae fluxes when -DCSIRO_BGC --- src/access/shared/gtracer_flux.F90 | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/access/shared/gtracer_flux.F90 b/src/access/shared/gtracer_flux.F90 index 4e264ac34..0ae12a12e 100644 --- a/src/access/shared/gtracer_flux.F90 +++ b/src/access/shared/gtracer_flux.F90 @@ -89,6 +89,11 @@ subroutine flux_exchange_init (Time, Ocean, Ocean_state, Ice_ocean_boundary, atm #if defined(ACCESS_CM) allocate(Ice_ocean_boundary%co2(isc:iec,jsc:jec)) #endif +#if defined(ACCESS_OM) && defined(CSIRO_BGC) + allocate( & + Ice_ocean_boundary%iof_nit(isc:iec,jsc:jec), & + Ice_ocean_boundary%iof_alg(isc:iec,jsc:jec)) +#endif Ice_ocean_boundary%u_flux = 0.0 Ice_ocean_boundary%v_flux = 0.0 @@ -115,6 +120,10 @@ subroutine flux_exchange_init (Time, Ocean, Ocean_state, Ice_ocean_boundary, atm #if defined(ACCESS_CM) Ice_ocean_boundary%co2 = 0.0 #endif +#if defined(ACCESS_OM) && defined(CSIRO_BGC) + Ice_ocean_boundary%iof_nit = 0.0 + Ice_ocean_boundary%iof_alg = 0.0 +#endif ! Spawn 2D Ocean%fields FMS coupler type from 1D gas_fields_ocn call coupler_type_spawn(gas_fields_ocn, Ocean%fields, (/isc,isc,iec,iec/), &