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

Coupling support for GEOS-ESM #491

Draft
wants to merge 36 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
840a09b
added ifdef to protect additional arguments
zhaobin74 Oct 25, 2022
0fea3b7
add extra arguments to various thermo routines; skip surface flux ste…
zhaobin74 Nov 7, 2022
98647f4
mods for recomputing sublimation/condensation
zhaobin74 Nov 8, 2022
efc5483
properly account for extra energy due to inconsistent cond/subl treat…
zhaobin74 Dec 20, 2022
ace2808
move flatn update into convergence loop
zhaobin74 Jan 13, 2023
72e6f7a
change enthalpy computation for condensed ice; use sblx to track diff…
zhaobin74 Jan 13, 2023
7b3ddb1
refactor addtional arguments passing and protect against potential er…
zhaobin74 Jan 17, 2023
b9b1dad
add sblx to fhocn to conserve energy
zhaobin74 Jan 25, 2023
05d53f6
fixed a bug (sblx is added to fhocn instead of efinal)
zhaobin74 Jan 26, 2023
8b85358
allow addtional band of penetrative sw flux to be computed
zhaobin74 Jan 27, 2023
a588900
refactored code to get addtional penertrative sw fluxes through ice; …
zhaobin74 Jan 30, 2023
711bcaf
add additional penetrating sw flux to merge_fluxes call
zhaobin74 Feb 2, 2023
200b1b4
fixed a bug
zhaobin74 Feb 4, 2023
800d9f5
fixed a bug causing fswthru_*dr/df to accumulate values over time steps
zhaobin74 Feb 6, 2023
49bb2cf
do not add frain to fresh when coupled to GEOS
zhaobin74 Feb 22, 2023
b35edc0
not allowing fsurfn to be reset to zero when coupled to GEOS
zhaobin74 Mar 22, 2023
3881c17
merged with Icepack1.3.3 and resolved conflicts
zhaobin74 Apr 17, 2023
53a3332
refactor thermo routines; use module vars to pass cpl fluxes and mini…
zhaobin74 May 5, 2023
7eeba49
change account code to be able to submit jobs
zhaobin74 May 8, 2023
f240d67
change batching test jobs to running them on interactive nodes becaus…
zhaobin74 May 8, 2023
81a7628
on discover, use interactive node to run tests; fix tsdir when not us…
zhaobin74 May 11, 2023
e7b4551
uncomment code recomputing zqin for BL99
zhaobin74 Aug 22, 2023
8d80ff5
Merge pull request #1 from GEOS-ESM/bugfix/zhaobin74/recompute-enthalpy
mathomp4 Aug 23, 2023
abbbd62
enable mushy layer thermodynamics scheme (#2)
zhaobin74 Aug 31, 2023
73467f6
fixed a bug of correcting zqsn(1) prematually when ktherm=2
zhaobin74 Oct 4, 2023
9e8f134
Merge pull request #3 from GEOS-ESM/bugfix/zhaobin74/not-correcting-z…
zhaobin74 Oct 5, 2023
3122eef
first attempt at enabling delta Eddington shortwave scheme in GEOS
zhaobin74 Dec 14, 2023
276d608
Merge pull request #4 from GEOS-ESM/feature/zhaobin74/dEdd-meltpond-geos
zhaobin74 Jan 30, 2024
c6f03a2
merged with main post 650; resolved conflicts; to be built and tested
zhaobin74 Apr 23, 2024
9c0b042
fix errors due to merging
zhaobin74 Apr 24, 2024
9f73bae
Merge pull request #5 from GEOS-ESM/feature/zhaobin74/merge-main-post650
zhaobin74 May 3, 2024
a65d620
remove debugging facility code
zhaobin74 Jun 5, 2024
86cf3b3
remove some files
zhaobin74 Jun 6, 2024
7edcd05
restore to consortium version; not needed to be speific to geos
zhaobin74 Jun 6, 2024
f31b5a9
revert back to consortium version
zhaobin74 Jun 6, 2024
572ea3d
add/correct some comments to geos specific SW fluxes
zhaobin74 Jun 11, 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
25 changes: 24 additions & 1 deletion columnphysics/icepack_flux.F90
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,9 @@ subroutine merge_fluxes (aicen, &
fhocnn, fswthrun, &
fswthrun_vdr, fswthrun_vdf,&
fswthrun_idr, fswthrun_idf,&
strairxT, strairyT, &
fswthrun_uvrdr, fswthrun_uvrdf,&
fswthrun_pardr, fswthrun_pardf,&
strairxT, strairyT, &
Cdn_atm_ratio, &
fsurf, fcondtop, &
fcondbot, &
Expand All @@ -56,6 +58,8 @@ subroutine merge_fluxes (aicen, &
fhocn, fswthru, &
fswthru_vdr, fswthru_vdf,&
fswthru_idr, fswthru_idf,&
fswthru_uvrdr, fswthru_uvrdf,&
fswthru_pardr, fswthru_pardf,&
melttn, meltsn, meltbn, congeln, snoicen, &
meltt, melts, &
meltb, dsnow, dsnown,&
Expand Down Expand Up @@ -89,6 +93,10 @@ subroutine merge_fluxes (aicen, &
fsaltn , & ! salt flux to ocean (kg/m2/s)
fhocnn , & ! actual ocn/ice heat flx (W/m**2)
fswthrun, & ! sw radiation through ice bot (W/m**2)
fswthrun_uvrdr, & ! vis dir sw radiation through ice bot (W/m**2)
fswthrun_uvrdf, & ! vis dir sw radiation through ice bot (W/m**2)
fswthrun_pardr, & ! vis dir sw radiation through ice bot (W/m**2)
fswthrun_pardf, & ! vis dir sw radiation through ice bot (W/m**2)
melttn , & ! top ice melt (m)
meltbn , & ! bottom ice melt (m)
meltsn , & ! snow melt (m)
Expand Down Expand Up @@ -139,6 +147,12 @@ subroutine merge_fluxes (aicen, &
fswthru_idf ! nir dif sw radiation through ice bot (W/m**2)

real (kind=dbl_kind), intent(inout), optional :: &
fswthru_uvrdr , & ! vis dir sw radiation through ice bot (W/m**2)
fswthru_uvrdf , & ! vis dif sw radiation through ice bot (W/m**2)
fswthru_pardr , & ! nir dir sw radiation through ice bot (W/m**2)
fswthru_pardf ! nir dif sw radiation through ice bot (W/m**2)

real (kind=dbl_kind), optional, intent(inout):: &
dsnow, & ! change in snow depth (m)
Uref ! air speed reference level (m/s)

Expand Down Expand Up @@ -212,6 +226,15 @@ subroutine merge_fluxes (aicen, &
if (present(fswthru_idf)) &
fswthru_idf = fswthru_idf + fswthrun_idf * aicen

if (present(fswthru_uvrdr)) &
fswthru_uvrdr = fswthru_uvrdr + fswthrun_uvrdr * aicen
if (present(fswthru_uvrdf)) &
fswthru_uvrdf = fswthru_uvrdf + fswthrun_uvrdf * aicen
if (present(fswthru_pardr)) &
fswthru_pardr = fswthru_pardr + fswthrun_pardr * aicen
if (present(fswthru_pardf)) &
fswthru_pardf = fswthru_pardf + fswthrun_pardf * aicen

! ice/snow thickness

meltt = meltt + melttn * aicen
Expand Down
Loading