Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert setting of use_ARCTIC variable #425

Merged
merged 1 commit into from
Oct 27, 2024
Merged

Revert setting of use_ARCTIC variable #425

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions cime_config/buildcpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
10 changes: 0 additions & 10 deletions cime_config/namelist_definition_blom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -902,16 +902,6 @@
<desc>optionally turn on additional diagnostics</desc>
</entry>

<entry id="use_arctic">
<type>logical</type>
<category>limits</category>
<group>limits</group>
<values>
<value>.true.</value>
</values>
<desc>if region includes arctic ocean</desc>
</entry>

<!-- ========================= -->
<!-- namelist group: vcoord -->
<!-- ========================= -->
Expand Down
5 changes: 5 additions & 0 deletions phy/mod_ifdefs.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
6 changes: 2 additions & 4 deletions phy/mod_rdlim.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -144,7 +144,7 @@ subroutine rdlim()
cnsvdi, &
csdiag, &
rstfrq,rstfmt,rstcmp,iotype,use_stream_relaxation, &
use_diag, use_arctic
use_diag

! read limits namelist

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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))
Expand Down
4 changes: 1 addition & 3 deletions phy/mod_xc.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -175,9 +176,6 @@ module mod_xc
logical :: use_DEBUG_ALL = .false.
logical :: use_TIMER = .false.

! other namelist flags
logical :: use_ARCTIC = .true.

contains

!**************************************************************************************
Expand Down