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 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 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/), &