Skip to content

Commit df8ec00

Browse files
committed
Revert from mkmf build the ability to build ACCESS models with generic tracer WOMBAT
This is supported properly through the CMake build system
1 parent 540f665 commit df8ec00

File tree

4 files changed

+4
-12
lines changed

4 files changed

+4
-12
lines changed

.gitmodules

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +0,0 @@
1-
[submodule "generic_tracers"]
2-
path = src/access/generic_tracers
3-
url = https://github.com/ACCESS-NRI/GFDL-generic-tracers.git

exp/MOM_compile.csh

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,8 @@ if ( $help ) then
5757
echo " EBM : ocean-seaice-land-atmosphere coupled model with energy balance atmosphere"
5858
echo " ACCESS-CM : ocean component of ACCESS-CM model."
5959
echo " ACCESS-OM : ocean component of ACCESS-OM model."
60-
echo " ACCESS-ESM : ocean component of ACCESS-ESM model with support for generic tracer WOMBATlite."
61-
echo " ACCESS-OM-BGC: ocean component of ACCESS-OM model with CSIRO BGC (Wombat). Wombat has now been"
62-
echo " implemented as a generic tracer and is available in the ACCESS-OM model type."
63-
echo " ACCESS-OM-BGC is retained only for legacy."
60+
echo " ACCESS-ESM : ocean component of ACCESS-ESM model with CSIRO BGC (Wombat)."
61+
echo " ACCESS-OM-BGC: ocean component of ACCESS-OM model with CSIRO BGC (Wombat)."
6462
echo
6563
echo "--platform followed by the platform name that has a corresponding environ file in the ../bin dir, default is gfortran"
6664
echo
@@ -106,13 +104,13 @@ endif
106104
if ( $type == EBM ) then
107105
set cppDefs = ( "-Duse_netCDF -Duse_netCDF3 -Duse_libMPI -DLAND_BND_TRACERS -DOVERLOAD_C8 -DOVERLOAD_C4 -DOVERLOAD_R4" )
108106
else if( $type == ACCESS-OM ) then
109-
set cppDefs = ( "-Duse_netCDF -Duse_libMPI -DACCESS_OM -DUSE_OCEAN_BGC" )
107+
set cppDefs = ( "-Duse_netCDF -Duse_libMPI -DACCESS_OM" )
110108
else if( $type == ACCESS-OM-BGC ) then
111109
set cppDefs = ( "-Duse_netCDF -Duse_libMPI -DACCESS_OM -DCSIRO_BGC" )
112110
else if( $type == ACCESS-CM ) then
113111
set cppDefs = ( "-Duse_netCDF -Duse_libMPI -DACCESS_CM" )
114112
else if( $type == ACCESS-ESM ) then
115-
set cppDefs = ( "-Duse_netCDF -Duse_libMPI -DACCESS_CM -DUSE_OCEAN_BGC" )
113+
set cppDefs = ( "-Duse_netCDF -Duse_libMPI -DACCESS_CM" )
116114
endif
117115

118116
if ( $unit_testing ) then

exp/ocean_compile.csh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ if( $type == ACCESS-OM || $type == ACCESS-CM || $type == ACCESS-OM-BGC || $type
88
set srcList = ( $srcList mom5/ocean_access )
99
if( $type == ACCESS-OM-BGC ) then
1010
set srcList = ( $srcList mom5/ocean_csiro_bgc )
11-
else if ( $type == ACCESS-OM || $type == ACCESS-ESM ) then
12-
set srcList = ( $srcList mom5/ocean_bgc access/generic_tracers/generic_tracers access/generic_tracers/mocsy/src )
1311
endif
1412
mkdir -p $executable:h:h/$type/$lib_name
1513
cd $executable:h:h/$type/$lib_name

src/access/generic_tracers

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)