diff --git a/cime_config/buildcpp b/cime_config/buildcpp
index 92fb7b1f..c4355114 100644
--- a/cime_config/buildcpp
+++ b/cime_config/buildcpp
@@ -89,6 +89,9 @@ def buildcpp(case):
if pio_typename == "pnetcdf":
blom_cppdefs = blom_cppdefs + " -DPNETCDF"
+ if ocn_grid in ["tnx2v1", "tnx1.5v1", "tnx1v1", "tnx1v3", "tnx1v4", "tnx0.5v1", "tnx0.25v1", "tnx0.25v3", "tnx0.25v4", "tnx0.125v4"]:
+ blom_cppdefs = blom_cppdefs + " -DARCTIC"
+
if ocn_grid in ["gx1v5", "gx1v6", "tnx1v1", "tnx1v3", "tnx1v4", "tnx0.5v1", "tnx0.25v1", "tnx0.25v3", "tnx0.25v4", "tnx0.125v4"]:
blom_cppdefs = blom_cppdefs + " -DLEVITUS2X"
diff --git a/cime_config/namelist_definition_blom.xml b/cime_config/namelist_definition_blom.xml
index 880b6445..970c37ad 100644
--- a/cime_config/namelist_definition_blom.xml
+++ b/cime_config/namelist_definition_blom.xml
@@ -902,16 +902,6 @@
optionally turn on additional diagnostics
-
- logical
- limits
- limits
-
- .true.
-
- if region includes arctic ocean
-
-
diff --git a/phy/mod_ifdefs.F90 b/phy/mod_ifdefs.F90
index 3af811f9..d8de5353 100644
--- a/phy/mod_ifdefs.F90
+++ b/phy/mod_ifdefs.F90
@@ -43,6 +43,11 @@ module mod_ifdefs
#else
logical :: use_MKS = .false.
#endif
+#ifdef ARCTIC
+ logical :: use_ARCTIC = .true.
+#else
+ logical :: use_ARCTIC = .false.
+#endif
! Namelist input
logical :: use_diag = .false.
diff --git a/phy/mod_rdlim.F90 b/phy/mod_rdlim.F90
index 41aeb3f2..aa07f944 100644
--- a/phy/mod_rdlim.F90
+++ b/phy/mod_rdlim.F90
@@ -28,7 +28,7 @@ module mod_rdlim
nstep2, nstep, lstep, nstep_in_day, time0, &
time, baclin, batrop, init_timevars, &
set_day_of_year, step_time
- use mod_xc, only: xcbcst, xchalt, xcstop, mnproc, lp, use_arctic
+ use mod_xc, only: xcbcst, xchalt, xcstop, mnproc, lp
use mod_grid, only: grfile
use mod_eos, only: pref
use mod_inicon, only: icfile
@@ -144,7 +144,7 @@ subroutine rdlim()
cnsvdi, &
csdiag, &
rstfrq,rstfmt,rstcmp,iotype,use_stream_relaxation, &
- use_diag, use_arctic
+ use_diag
! read limits namelist
@@ -250,7 +250,6 @@ subroutine rdlim()
write (lp,*) 'IOTYPE',IOTYPE
write (lp,*) 'USE_STREAM_RELAXATION',use_stream_relaxation
write (lp,*) 'USE_DIAG',use_diag
- write (lp,*) 'USE_ARCTIC',use_arctic
write (lp,*)
end if
@@ -335,7 +334,6 @@ subroutine rdlim()
call xcbcst(iotype)
call xcbcst(use_stream_relaxation)
call xcbcst(use_diag)
- call xcbcst(use_arctic)
! resolve options
select case (trim(wavsrc))
diff --git a/phy/mod_xc.F90 b/phy/mod_xc.F90
index f87aad96..8fcf6ba0 100644
--- a/phy/mod_xc.F90
+++ b/phy/mod_xc.F90
@@ -25,6 +25,7 @@ module mod_xc
use dimensions, only: idm,jdm,kdm,itdm,jtdm,iqr,jqr,ijqr,&
ii_pe,jj_pe,i0_pe,j0_pe,nreg
use mod_wtime, only: wtime
+ use mod_ifdefs, only: use_arctic
implicit none
public
@@ -175,9 +176,6 @@ module mod_xc
logical :: use_DEBUG_ALL = .false.
logical :: use_TIMER = .false.
- ! other namelist flags
- logical :: use_ARCTIC = .true.
-
contains
!**************************************************************************************