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

Jump to bottom

Deprecate gx1 CORE forcing option #643

Merged
merged 2 commits into from
Oct 14, 2021
Merged

Deprecate gx1 CORE forcing option #643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
87a1a97
deprecate gx1 core forcing option
apcraig Oct 12, 2021
1bda33a
deprecate gx1 core forcing option
apcraig Oct 12, 2021
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
15 changes: 11 additions & 4 deletions cicecore/cicedynB/general/ice_forcing.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ module ice_forcing
atm_data_format, & ! 'bin'=binary or 'nc'=netcdf
ocn_data_format, & ! 'bin'=binary or 'nc'=netcdf
atm_data_type, & ! 'default', 'monthly', 'ncar',
! 'LYq' or 'hadgem' or 'oned' or
! 'hadgem' or 'oned' or
! 'JRA55_gx1' or 'JRA55_gx3' or 'JRA55_tx1'
bgc_data_type, & ! 'default', 'clim'
ocn_data_type, & ! 'default', 'clim', 'ncar', 'oned',
Expand Down Expand Up @@ -290,8 +290,10 @@ subroutine init_forcing_atmo
! default forcing values from init_flux_atm
if (trim(atm_data_type) == 'ncar') then
call NCAR_files(fyear)
#ifdef UNDEPRECATE_LYq
elseif (trim(atm_data_type) == 'LYq') then
call LY_files(fyear)
#endif
elseif (trim(atm_data_type) == 'JRA55_gx1') then
call JRA55_gx1_files(fyear)
elseif (trim(atm_data_type) == 'JRA55_gx3') then
Expand Down Expand Up @@ -606,8 +608,10 @@ subroutine get_forcing_atmo

if (trim(atm_data_type) == 'ncar') then
call ncar_data
#ifdef UNDEPRECATE_LYq
elseif (trim(atm_data_type) == 'LYq') then
call LY_data
#endif
elseif (trim(atm_data_type) == 'JRA55_gx1') then
call JRA55_data
elseif (trim(atm_data_type) == 'JRA55_gx3') then
Expand Down Expand Up @@ -1621,6 +1625,7 @@ subroutine prepare_forcing (nx_block, ny_block, &
enddo
enddo

#ifdef UNDEPRECATE_LYq
elseif (trim(atm_data_type) == 'LYq') then

! precip is in mm/s
Expand All @@ -1636,7 +1641,7 @@ subroutine prepare_forcing (nx_block, ny_block, &
hm(i,j), flw(i,j))
enddo
enddo

#endif
elseif (trim(atm_data_type) == 'oned') then ! rectangular grid

! precip is in kg/m^2/s
Expand Down Expand Up @@ -2089,6 +2094,7 @@ subroutine ncar_data

end subroutine ncar_data

#ifdef UNDEPRECATE_LYq
!=======================================================================
! Large and Yeager forcing (AOMIP style)
!=======================================================================
Expand Down Expand Up @@ -2145,7 +2151,7 @@ subroutine LY_files (yr)
endif ! master_task

end subroutine LY_files

#endif
!=======================================================================

subroutine JRA55_gx1_files(yr)
Expand Down Expand Up @@ -2209,6 +2215,7 @@ subroutine JRA55_gx3_files(yr)
endif
end subroutine JRA55_gx3_files

#ifdef UNDEPRECATE_LYq
!=======================================================================
!
! read Large and Yeager atmospheric data
Expand Down Expand Up @@ -2432,7 +2439,7 @@ subroutine LY_data
endif ! debug_forcing

end subroutine LY_data

#endif
!=======================================================================

subroutine JRA55_data
Expand Down
10 changes: 0 additions & 10 deletions configuration/scripts/options/set_nml.gx1coreii
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion configuration/scripts/tests/base_suite.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ smoke gx3 8x2 diag24,run5day,zsal,debug
restart gx3 8x2 zsal
restart gx3 8x2 gx3ncarbulk,debug
restart gx3 4x4 gx3ncarbulk,diag1
restart gx1 24x1 gx1coreii,short
smoke gx3 4x1 calcdragio
restart gx3 4x2 atmbndyconstant
restart gx3 4x2 atmbndymixed
15 changes: 0 additions & 15 deletions doc/source/developer_guide/dg_forcing.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,21 +150,6 @@ Users are encouraged to switch to the JRA55 (see :ref:`JRA55forcing`) dataset.
atmosphere forcing dataset may be deprecated in the future.


.. _LYqforcing:

LYq Atmosphere Forcing
-------------------------

The LYq (:cite:`Hunke07`) forcing was used in earlier standalone
runs on the gx1 grid, and the
Consortium continues to do some very limited testing with this forcing dataset.
This dataset is largely based on the CORE II data.
Monthly average data for cldf and fsnow is read while 6-hourly data for Qa, Tair,
uatm, and vatm are read with other fields derived or set by default.
Users are encouraged to switch to the JRA55 (see :ref:`JRA55forcing`) dataset. This
atmosphere forcing dataset may be deprecated in the future.


.. _defaultforcing:

Default Atmosphere Forcing
Expand Down
1 change: 0 additions & 1 deletion doc/source/user_guide/ug_case_settings.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -542,7 +542,6 @@ forcing_nml
"", "``JRA55_gx1``", "JRA55 forcing data for gx1 grid :cite:`Tsujino18`", ""
"", "``JRA55_gx3``", "JRA55 forcing data for gx3 grid :cite:`Tsujino18`", ""
"", "``JRA55_tx1``", "JRA55 forcing data for tx1 grid :cite:`Tsujino18`", ""
"", "``LYq``", "COREII Large-Yeager (AOMIP) forcing data :cite:`Large09`", ""
"", "``monthly``", "monthly forcing data", ""
"", "``ncar``", "NCAR bulk forcing data", ""
"", "``oned``", "column forcing data", ""
Expand Down