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

Bugfix: sign error on fprec for nuopc and mct caps #1

Merged
merged 22 commits into from
Jan 22, 2021
Merged

Bugfix: sign error on fprec for nuopc and mct caps #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
2b7abec
Merge pull request #2 from NOAA-EMC/dev/emc
DeniseWorthen Nov 26, 2019
74f8d11
Merge pull request #4 from NOAA-EMC/dev/emc
DeniseWorthen Dec 6, 2019
fb02b3a
Merge pull request #5 from NOAA-EMC/dev/emc
DeniseWorthen Jan 16, 2020
5927048
Merge pull request #6 from NOAA-EMC/dev/emc
DeniseWorthen Jan 24, 2020
1be1217
Merge pull request #7 from NOAA-EMC/dev/emc
DeniseWorthen Apr 6, 2020
d537911
Merge pull request #9 from NOAA-EMC/dev/emc
DeniseWorthen Apr 9, 2020
58a69fc
Merge pull request #10 from NOAA-EMC/dev/emc
DeniseWorthen Apr 16, 2020
6371e48
Merge remote-tracking branch 'upstream/dev/emc' into dev/emc
DeniseWorthen Jul 10, 2020
40bfb4b
Merge remote-tracking branch 'upstream/dev/emc' into dev/emc
DeniseWorthen Aug 1, 2020
e4ca1dc
Merge remote-tracking branch 'upstream/dev/emc' into dev/emc
DeniseWorthen Aug 6, 2020
4e51bae
Revert "Merge remote-tracking branch 'upstream/dev/emc' into dev/emc"
DeniseWorthen Aug 7, 2020
6164f63
manual add of dev/emc changes (statediagnose)
DeniseWorthen Sep 1, 2020
bfbd95a
white space changes
DeniseWorthen Sep 1, 2020
16ade2f
Merge remote-tracking branch 'upstream/dev/emc' into dev/emc
DeniseWorthen Sep 9, 2020
f3bb728
Merge remote-tracking branch 'upstream/dev/emc' into dev/emc
DeniseWorthen Oct 19, 2020
a98f7db
Merge remote-tracking branch 'upstream/dev/emc' into dev/emc
DeniseWorthen Nov 25, 2020
69b2a23
Merge remote-tracking branch 'upstream/dev/emc' into dev/emc
DeniseWorthen Jan 6, 2021
91282c1
add brandon's halo update fix for LI_2016
DeniseWorthen Jan 15, 2021
b544dad
Merge remote-tracking branch 'upstream/dev/emc' into dev/emc
DeniseWorthen Jan 22, 2021
e928fe2
Merge branch 'dev/emc' into bugfix/li2016fix
DeniseWorthen Jan 22, 2021
66ec49b
Merge remote-tracking branch 'JiandeWang/feature/update-to-GFDL-20210…
DeniseWorthen Jan 22, 2021
e7d0976
Fixes latent heat from fprec and frunoff
gustavo-marques Jan 21, 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
12 changes: 6 additions & 6 deletions config_src/mct_driver/mom_surface_forcing_mct.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -486,17 +486,17 @@ subroutine convert_IOB_to_fluxes(IOB, fluxes, index_bounds, Time, valid_time, G,

! latent heat flux (W/m^2)
fluxes%latent(i,j) = 0.0
! contribution from frozen ppt
! contribution from frozen ppt (notice minus sign since fprec is positive into the ocean)
if (associated(IOB%fprec)) then
fluxes%latent(i,j) = fluxes%latent(i,j) + &
fluxes%latent(i,j) = fluxes%latent(i,j) - &
IOB%fprec(i-i0,j-j0)*US%W_m2_to_QRZ_T*CS%latent_heat_fusion
fluxes%latent_fprec_diag(i,j) = G%mask2dT(i,j) * IOB%fprec(i-i0,j-j0)*US%W_m2_to_QRZ_T*CS%latent_heat_fusion
fluxes%latent_fprec_diag(i,j) = - G%mask2dT(i,j) * IOB%fprec(i-i0,j-j0)*US%W_m2_to_QRZ_T*CS%latent_heat_fusion
endif
! contribution from frozen runoff
! contribution from frozen runoff (notice minus sign since rofi_flux is positive into the ocean)
if (associated(fluxes%frunoff)) then
fluxes%latent(i,j) = fluxes%latent(i,j) + &
fluxes%latent(i,j) = fluxes%latent(i,j) - &
IOB%rofi_flux(i-i0,j-j0)*US%W_m2_to_QRZ_T*CS%latent_heat_fusion
fluxes%latent_frunoff_diag(i,j) = G%mask2dT(i,j) * IOB%rofi_flux(i-i0,j-j0)*US%W_m2_to_QRZ_T*CS%latent_heat_fusion
fluxes%latent_frunoff_diag(i,j) = - G%mask2dT(i,j) * IOB%rofi_flux(i-i0,j-j0)*US%W_m2_to_QRZ_T*CS%latent_heat_fusion
endif
! contribution from evaporation
if (associated(IOB%q_flux)) then
Expand Down
10 changes: 6 additions & 4 deletions config_src/nuopc_driver/mom_surface_forcing_nuopc.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -497,15 +497,17 @@ subroutine convert_IOB_to_fluxes(IOB, fluxes, index_bounds, Time, valid_time, G,
fluxes%seaice_melt(i,j) = kg_m2_s_conversion * G%mask2dT(i,j) * IOB%seaice_melt(i-i0,j-j0)

fluxes%latent(i,j) = 0.0
! notice minus sign since fprec is positive into the ocean
if (associated(IOB%fprec)) then
fluxes%latent(i,j) = fluxes%latent(i,j) + &
fluxes%latent(i,j) = fluxes%latent(i,j) - &
IOB%fprec(i-i0,j-j0)*US%W_m2_to_QRZ_T*CS%latent_heat_fusion
fluxes%latent_fprec_diag(i,j) = G%mask2dT(i,j) * IOB%fprec(i-i0,j-j0)*US%W_m2_to_QRZ_T*CS%latent_heat_fusion
fluxes%latent_fprec_diag(i,j) = - G%mask2dT(i,j) * IOB%fprec(i-i0,j-j0)*US%W_m2_to_QRZ_T*CS%latent_heat_fusion
endif
! notice minus sign since frunoff is positive into the ocean
if (associated(IOB%frunoff)) then
fluxes%latent(i,j) = fluxes%latent(i,j) + &
fluxes%latent(i,j) = fluxes%latent(i,j) - &
IOB%frunoff(i-i0,j-j0) * US%W_m2_to_QRZ_T * CS%latent_heat_fusion
fluxes%latent_frunoff_diag(i,j) = G%mask2dT(i,j) * &
fluxes%latent_frunoff_diag(i,j) = - G%mask2dT(i,j) * &
IOB%frunoff(i-i0,j-j0) * US%W_m2_to_QRZ_T * CS%latent_heat_fusion
endif
if (associated(IOB%q_flux)) then
Expand Down