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.

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

Update CICE with CMIP changes. #191

Merged
merged 43 commits into from
Sep 27, 2018
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
ab28b45
Remove some dummy arguments and unused variables.
dabail10 Mar 20, 2018
7cb653a
Merge branch 'master' of https://github.com/dabail10/CICE
dabail10 Mar 20, 2018
d360f95
Merge branch 'master' of https://github.com/CICE-Consortium/CICE into…
dabail10 Mar 23, 2018
38ee675
Dummy variable cleanup
dabail10 Mar 23, 2018
8864f0e
Cleanup
dabail10 Apr 2, 2018
9c7d03e
Merge with trunk
dabail10 Apr 2, 2018
9c1056f
Merge pull request #1 from dabail10/dummy
dabail10 Apr 2, 2018
894f85c
Remove icepack from commit
dabail10 Apr 2, 2018
25b603c
Reset icepack master
dabail10 Apr 2, 2018
93e470a
Fix
dabail10 Apr 2, 2018
7021d13
Fix
dabail10 Apr 2, 2018
c738e5e
Update icepack
dabail10 Apr 2, 2018
60bffa8
fix
dabail10 Apr 2, 2018
4979014
Fix flush ifdef logic
dabail10 Apr 2, 2018
443029c
Merge branch 'master' of https://github.com/CICE-Consortium/CICE into…
dabail10 Apr 6, 2018
0ac1c6d
Updated dummy variables
dabail10 Apr 27, 2018
fe28cec
Uninitialized variables.
dabail10 May 1, 2018
b24930e
Merge branch 'master' of https://github.com/CICE-Consortium/CICE into…
dabail10 May 1, 2018
bd9bdd1
Additional initialization
dabail10 May 4, 2018
3c6305d
Update dummy
dabail10 May 16, 2018
24dcb3e
Update from master
dabail10 May 16, 2018
cb9e3c9
more dummy fixes
dabail10 Jun 4, 2018
6ee5463
Update from trunk
dabail10 Jun 4, 2018
77aee28
More hobart changes
dabail10 Jun 27, 2018
4cbdb64
Update to CICE master
dabail10 Jun 27, 2018
017fdf6
Update to CICE master
dabail10 Jun 27, 2018
f381e10
Merge pull request #2 from dabail10/dummy
dabail10 Jun 27, 2018
25f6da3
Update Hobart Intel settings
dabail10 Jun 27, 2018
0487249
Merge branch 'master' of https://github.com/dabail10/CICE
dabail10 Jun 27, 2018
ef78774
Additional Hobart Intel changes
dabail10 Jun 27, 2018
f9101ea
Update to CICE master
dabail10 Aug 22, 2018
263496a
Update icepack
dabail10 Aug 22, 2018
c7942e2
Some tweaks to dummy variables
dabail10 Aug 24, 2018
51f832f
Remove some initialization code.
dabail10 Aug 28, 2018
7f654e5
Merge branch 'master' of https://github.com/CICE-Consortium/CICE into…
dabail10 Aug 28, 2018
0f41eda
Initialization needed for CICE
dabail10 Aug 31, 2018
531105d
Add gravit to ice_dyn_shared.F90
dabail10 Aug 31, 2018
72efd48
CMIP history changes
dabail10 Sep 6, 2018
cedbd7c
CMIP changes
dabail10 Sep 10, 2018
42ec75e
Update from master
dabail10 Sep 24, 2018
00f0b8c
Update icepack
dabail10 Sep 24, 2018
aad5102
Redo istat changes
dabail10 Sep 24, 2018
599929f
Update icepack to CMIP
dabail10 Sep 26, 2018
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
Prev Previous commit
Next Next commit
Update dummy
  • Loading branch information
dabail10 committed May 16, 2018
commit 3c6305ddd81ba05e133df7c48f91101710d95892
24 changes: 21 additions & 3 deletions cicecore/cicedynB/general/ice_forcing.F90
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,21 @@ subroutine init_forcing_atmo
! Determine the current and final year of the forcing cycle based on
! namelist input; initialize the atmospheric forcing data filenames.

fsw_data(:,:,:,:) = c0
cldf_data(:,:,:,:) = c0
fsnow_data(:,:,:,:) = c0
Tair_data(:,:,:,:) = c0
uatm_data(:,:,:,:) = c0
vatm_data(:,:,:,:) = c0
wind_data(:,:,:,:) = c0
strax_data(:,:,:,:) = c0
stray_data(:,:,:,:) = c0
Qa_data(:,:,:,:) = c0
rhoa_data(:,:,:,:) = c0
flw_data(:,:,:,:) = c0
sublim_data(:,:,:,:) = c0
frain_data(:,:,:,:) = c0

fyear = fyear_init + mod(nyr-1,ycycle) ! current year
fyear_final = fyear_init + ycycle - 1 ! last year in forcing cycle

Expand Down Expand Up @@ -239,6 +254,11 @@ subroutine init_forcing_ocn(dt)
if (icepack_warnings_aborted()) call abort_ice(error_message="subname", &
file=__FILE__, line=__LINE__)

sst_data(:,:,:,:) = c0
sss_data(:,:,:,:) = c0
uocn_data(:,:,:,:) = c0
vocn_data(:,:,:,:) = c0

nbits = 64 ! double precision data

if (restore_sst .or. restore_bgc) then
Expand Down Expand Up @@ -590,7 +610,7 @@ subroutine read_data (flag, recd, yr, ixm, ixx, ixp, &
maxrec ! maximum record value

real (kind=dbl_kind), dimension(nx_block,ny_block,2,max_blocks), &
intent(out) :: &
intent(inout) :: &
field_data ! 2 values needed for interpolation

integer (kind=int_kind), intent(in) :: &
Expand All @@ -611,8 +631,6 @@ subroutine read_data (flag, recd, yr, ixm, ixx, ixp, &

call ice_timer_start(timer_readwrite) ! reading/writing

field_data(:,:,:,:) = c0

nbits = 64 ! double precision data

if (istep1 > check_step) dbug = .true. !! debugging
Expand Down
82 changes: 41 additions & 41 deletions configuration/scripts/ice_in
Original file line number Diff line number Diff line change
Expand Up @@ -50,18 +50,6 @@
kcatbound = 0
/

&domain_nml
nprocs = 4
processor_shape = 'slenderX2'
distribution_type = 'cartesian'
distribution_wght = 'latitude'
ew_boundary_type = 'cyclic'
ns_boundary_type = 'open'
maskhalo_dyn = .false.
maskhalo_remap = .false.
maskhalo_bound = .false.
/

&tracer_nml
tr_iage = .true.
restart_age = .false.
Expand Down Expand Up @@ -133,6 +121,47 @@
pndaspect = 0.8
/

&forcing_nml
formdrag = .false.
atmbndy = 'default'
fyear_init = 1997
ycycle = 1
atm_data_format = 'bin'
atm_data_type = 'ncar'
atm_data_dir = '/glade/u/home/tcraig/cice_data/'
calc_strair = .true.
highfreq = .false.
natmiter = 5
calc_Tsfc = .true.
precip_units = 'mm_per_month'
ustar_min = 0.0005
fbot_xfer_type = 'constant'
update_ocn_f = .false.
l_mpond_fresh = .false.
tfrz_option = 'mushy'
oceanmixed_ice = .true.
ocn_data_format = 'bin'
sss_data_type = 'default'
sst_data_type = 'default'
ocn_data_dir = 'unknown_ocn_data_dir'
oceanmixed_file = 'unknown_oceanmixed_file'
restore_sst = .false.
trestore = 90
restore_ice = .false.
/

&domain_nml
nprocs = 4
processor_shape = 'slenderX2'
distribution_type = 'cartesian'
distribution_wght = 'latitude'
ew_boundary_type = 'cyclic'
ns_boundary_type = 'open'
maskhalo_dyn = .false.
maskhalo_remap = .false.
maskhalo_bound = .false.
/

&zbgc_nml
tr_brine = .false.
restart_hbrine = .false.
Expand Down Expand Up @@ -286,35 +315,6 @@
ratio_C2N_proteins = 7.0
/

&forcing_nml
formdrag = .false.
atmbndy = 'default'
fyear_init = 1997
ycycle = 1
atm_data_format = 'bin'
atm_data_type = 'ncar'
atm_data_dir = '/glade/u/home/tcraig/cice_data/'
calc_strair = .true.
highfreq = .false.
natmiter = 5
calc_Tsfc = .true.
precip_units = 'mm_per_month'
ustar_min = 0.0005
fbot_xfer_type = 'constant'
update_ocn_f = .false.
l_mpond_fresh = .false.
tfrz_option = 'mushy'
oceanmixed_ice = .true.
ocn_data_format = 'bin'
sss_data_type = 'default'
sst_data_type = 'default'
ocn_data_dir = 'unknown_ocn_data_dir'
oceanmixed_file = 'unknown_oceanmixed_file'
restore_sst = .false.
trestore = 90
restore_ice = .false.
/

&icefields_nml
f_tmask = .true.
f_blkmask = .true.
Expand Down