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

FSD fixes for conservation #495

Merged
merged 40 commits into from
Oct 31, 2024
Merged
Changes from 1 commit
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
28d8396
Fixes for freshwater and salt conservation
dabail10 May 30, 2024
3f9b25f
Fix heat conservation and rearrange rside computation
dabail10 Jul 24, 2024
d0334c8
Also fix tracer vicen_init
dabail10 Jul 24, 2024
f66423a
One more fix for the FSD and update the driver.
dabail10 Jul 29, 2024
1cd7f7f
The character array does not need to be different at each point. Fixe…
dabail10 Jul 30, 2024
fed338c
Change the floe boundaries to be the same for all points
dabail10 Jul 30, 2024
77e43af
Clean up some comments
dabail10 Jul 30, 2024
c9ad3bc
Use ktherm=1 when sw is ccsm3
dabail10 Aug 15, 2024
b82474e
Remove spatial index on wavefreq and dwavefreq
dabail10 Aug 21, 2024
4104292
fix some spaces
dabail10 Aug 21, 2024
88a417b
Remove spatial index for local wave_spectrum_profile
dabail10 Aug 21, 2024
003aa6f
Remove spatial index for local wave_spectrum_profile
dabail10 Aug 21, 2024
c4f2f9c
Remove spatial index for local wave_spectrum_profile
dabail10 Aug 21, 2024
3c07803
Remove spatial index for local wave_spectrum_profile
dabail10 Aug 21, 2024
8925988
clean up driver code
dabail10 Aug 21, 2024
a3f6fbd
clean up driver code
dabail10 Aug 21, 2024
bfbc456
clean up driver code
dabail10 Aug 21, 2024
896190d
clean up driver code
dabail10 Aug 21, 2024
b6f35ad
clean up driver code
dabail10 Aug 21, 2024
1dbe211
Fix heat conservation and rearrange rside computation
dabail10 Jul 24, 2024
6daa191
One more fix for the FSD and update the driver.
dabail10 Jul 29, 2024
6732ac3
The character array does not need to be different at each point. Fixe…
dabail10 Jul 30, 2024
901b259
Change the floe boundaries to be the same for all points
dabail10 Jul 30, 2024
8c32f9f
Clean up some comments
dabail10 Jul 30, 2024
65910c0
Remove spatial index on wavefreq and dwavefreq
dabail10 Aug 21, 2024
664436d
clean up driver code
dabail10 Aug 21, 2024
19be00b
clean up driver code
dabail10 Aug 21, 2024
54dc9a1
clean up driver code
dabail10 Aug 21, 2024
b7270c6
Fix up some more nx related stuff
dabail10 Sep 20, 2024
7cde537
Bug fix from the BGC merge
dabail10 Sep 23, 2024
44f71bb
Some more fixes resulting from the BGC merge
dabail10 Sep 24, 2024
2258ead
Merge branch 'CICE-Consortium:main' into fsdfixes
dabail10 Oct 2, 2024
d8c458d
Change all of the floe_ variables to be public module variables in ic…
dabail10 Oct 3, 2024
a8911c3
Add checks for optional afsdn and allocate l_afsdn
dabail10 Oct 9, 2024
07ded3b
Merge branch 'CICE-Consortium:main' into fsdfixes
dabail10 Oct 25, 2024
9a745f0
Add output arguments for floe_rad_l, floe_rad_c, floe_binwidth, and
apcraig Oct 25, 2024
5a703ba
Merge pull request #1 from apcraig/fsdfixes_tc02
dabail10 Oct 25, 2024
1bff0fb
Code cleanup in icepack_therm_itd.F90
dabail10 Oct 25, 2024
65ec921
Additional bug fix to floe_area_c
dabail10 Oct 25, 2024
a2c5bca
Delete some comments to clean up the code
dabail10 Oct 30, 2024
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
Remove spatial index on wavefreq and dwavefreq
dabail10 committed Sep 20, 2024
commit b82474e1913fc1e75e34c1e1cd0a496891a49ef7
2 changes: 1 addition & 1 deletion configuration/driver/icedrv_arrays_column.F90
Original file line number Diff line number Diff line change
@@ -228,7 +228,7 @@ module icedrv_arrays_column
real (kind=dbl_kind), dimension (nx), public :: &
wave_sig_ht ! significant height of waves (m)

real (kind=dbl_kind), dimension (nx,nfreq), public :: &
real (kind=dbl_kind), dimension (nfreq), public :: &
wavefreq, & ! wave frequencies
dwavefreq ! wave frequency bin widths

2 changes: 1 addition & 1 deletion configuration/driver/icedrv_forcing.F90
Original file line number Diff line number Diff line change
@@ -1154,7 +1154,7 @@ subroutine get_wave_spec

call icepack_init_wave(nfreq=nfreq, &
wave_spectrum_profile=wave_spectrum_profile(i,:), &
wavefreq=wavefreq(i,:), dwavefreq=dwavefreq(i,:))
wavefreq=wavefreq(:), dwavefreq=dwavefreq(:))
enddo

do k = 1, nfreq
4 changes: 2 additions & 2 deletions configuration/driver/icedrv_init.F90
Original file line number Diff line number Diff line change
@@ -1566,8 +1566,8 @@ subroutine init_fsd
wave_spectrum, d_afsd_newi, d_afsd_latg, d_afsd_latm, &
d_afsd_wave, d_afsd_weld

wavefreq (:,:) = c0
dwavefreq (:,:) = c0
wavefreq (:) = c0
dwavefreq (:) = c0
wave_sig_ht (:) = c0
wave_spectrum (:,:) = c0
d_afsd_newi (:,:) = c0
10 changes: 5 additions & 5 deletions configuration/driver/icedrv_step.F90
Original file line number Diff line number Diff line change
@@ -484,7 +484,7 @@ subroutine step_therm2 (dt)
if (tmask(i)) then
! wave_sig_ht - compute here to pass to add new ice
if (tr_fsd) &
wave_sig_ht(i) = c4*SQRT(SUM(wave_spectrum(i,:)*dwavefreq(i,:)))
wave_sig_ht(i) = c4*SQRT(SUM(wave_spectrum(i,:)*dwavefreq(:)))

call icepack_step_therm2(dt=dt, &
hin_max=hin_max(:), &
@@ -521,8 +521,8 @@ subroutine step_therm2 (dt)
H2_18O_ocn=H2_18O_ocn(i), &
wave_sig_ht=wave_sig_ht(i), &
wave_spectrum=wave_spectrum(i,:), &
wavefreq=wavefreq(i,:), &
dwavefreq=dwavefreq(i,:), &
wavefreq=wavefreq(:), &
dwavefreq=dwavefreq(:), &
d_afsd_latg=d_afsd_latg(i,:), &
d_afsd_newi=d_afsd_newi(i,:), &
d_afsd_latm=d_afsd_latm(i,:), &
@@ -690,8 +690,8 @@ subroutine step_dyn_wave (dt)
floe_rad_l = floe_rad_l (:), &
floe_rad_c = floe_rad_c (:), &
wave_spectrum = wave_spectrum(i,:), &
wavefreq = wavefreq (i,:), &
dwavefreq = dwavefreq (i,:), &
wavefreq = wavefreq (:), &
dwavefreq = dwavefreq (:), &
trcrn = trcrn (i,:,:), &
d_afsd_wave = d_afsd_wave (i,:))
end do ! i