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

Coupling support for GEOS-ESM #491

Draft
wants to merge 36 commits into
base: main
Choose a base branch
from
Draft

Coupling support for GEOS-ESM #491

wants to merge 36 commits into from

Conversation

zhaobin74
Copy link

PR checklist

  • Short (1 sentence) summary of your PR:
    This PR adds support for coupling CICE6/Icepack to NASA GMAO GEOS-ESM
  • Developer(s):
    @zhaobin74
  • Suggest PR reviewers from list in the column to the right.
    @eclare108213, @apcraig, @dabail10
  • Please copy the PR test results link or provide a summary of testing completed below.
    Run base_suite with both base tag (main) and this PR and got bit-for-bit identical results
  • How much do the PR code changes differ from the unmodified code?
    • bit for bit
    • different at roundoff level
    • more substantial
  • Does this PR create or have dependencies on CICE or any other models?
    • Yes
    • No
  • Does this PR add any new test cases?
    • Yes
    • No
  • Is the documentation being updated? ("Documentation" includes information on the wiki or in the .rst files from doc/source/, which are used to create the online technical docs at https://readthedocs.org/projects/cice-consortium-cice/.)
    • Yes
    • No, does the documentation need to be updated at a later time?
      • Yes
      • No
  • Please document the changes in detail, including why the changes are made. This will become part of the PR commit log.
    • Adds support for coupler provided surface flux and derivatives in BL99 and Mushy solver (necessary for coupling to GEOS-ESM atmosphere)
    • Adds additional bands of visible SW as input and outputs of resulting penetration flux (for GEOS-ESM)
    • When proper, use GEOSCOUPLED macro to isolate the relevant code specific to GEOS

Hi Consortium, I am putting this PR in draft mode for now to get feedbacks. I am happy to improve it with your help and suggestions.

zhaobin74 and others added 30 commits October 25, 2022 17:33
@zhaobin74
added ifdef to protect additional arguments
840a09b
@zhaobin74
add extra arguments to various thermo routines; skip surface flux ste…
0fea3b7 
…p and use passed in values to update Ts
@zhaobin74
mods for recomputing sublimation/condensation
98647f4
@zhaobin74
properly account for extra energy due to inconsistent cond/subl treat…
efc5483 
…ment; add solar to fsurf
@zhaobin74
move flatn update into convergence loop
ace2808
@zhaobin74
change enthalpy computation for condensed ice; use sblx to track diff…
72e6f7a 
…erenc from fresh ice
@zhaobin74
refactor addtional arguments passing and protect against potential er…
7b3ddb1 
…rors
@zhaobin74
add sblx to fhocn to conserve energy
b9b1dad
@zhaobin74
fixed a bug (sblx is added to fhocn instead of efinal)
05d53f6
@zhaobin74
allow addtional band of penetrative sw flux to be computed
8b85358
@zhaobin74
refactored code to get addtional penertrative sw fluxes through ice; …
a588900 
…remove ifdefs and use optional arguments
@zhaobin74
add additional penetrating sw flux to merge_fluxes call
711bcaf
@zhaobin74
fixed a bug
200b1b4
@zhaobin74
fixed a bug causing fswthru_*dr/df to accumulate values over time steps
800d9f5
@zhaobin74
do not add frain to fresh when coupled to GEOS
49bb2cf
@zhaobin74
not allowing fsurfn to be reset to zero when coupled to GEOS
b35edc0
@zhaobin74
merged with Icepack1.3.3 and resolved conflicts
3881c17
@zhaobin74
refactor thermo routines; use module vars to pass cpl fluxes and mini…
53a3332 
…mize routine interface changes
@zhaobin74
change account code to be able to submit jobs
7eeba49
@zhaobin74
change batching test jobs to running them on interactive nodes becaus…
f240d67 
…e debug queue has limit
@zhaobin74
on discover, use interactive node to run tests; fix tsdir when not us…
81a7628 
…ing suite; add a small_suite and a 15 day run set
@zhaobin74
uncomment code recomputing zqin for BL99
e7b4551
@mathomp4
Merge pull request #1 from GEOS-ESM/bugfix/zhaobin74/recompute-enthalpy
8d80ff5 
fix a bug of not updating enthalpy for BL99
@zhaobin74
enable mushy layer thermodynamics scheme (#2)
abbbd62 
* first attempt at enabling mushy layer thero scheme in GEOS coupling; built ok; needs tests

* fixed a tice_high bug in init_vertical; add updating fsurf/fsurf_cpl when Tsf gets reset to Tmlt

* protect ismyturn  with GEOSCOUPLED macro

* protect ismyturn with another GEOSCOUPLED macro

* remove printout i,j,tsk
@zhaobin74
fixed a bug of correcting zqsn(1) prematually when ktherm=2
73467f6
@zhaobin74
Merge pull request #3 from GEOS-ESM/bugfix/zhaobin74/not-correcting-z…
9e8f134 
…qsn-mushy

do not correct zqsn in condensation step when ktherm=2
@zhaobin74
first attempt at enabling delta Eddington shortwave scheme in GEOS
3122eef
@zhaobin74
Merge pull request #4 from GEOS-ESM/feature/zhaobin74/dEdd-meltpond-geos
276d608 
Enable delta Eddington shortwave scheme in GEOS
@zhaobin74
merged with main post 650; resolved conflicts; to be built and tested
c6f03a2
@zhaobin74
fix errors due to merging
9c0b042
@zhaobin74 zhaobin74 changed the title Geos ready for consortium Coupling support for GEOS-ESM Jun 13, 2024
@zhaobin74 zhaobin74 mentioned this pull request Jun 13, 2024
Draft
18 tasks
@apcraig
Copy link
Contributor

apcraig commented Jun 17, 2024

HI @zhaobin74. Thanks for putting these together. I've had a quick look and they look pretty reasonable. But I will go thru the modification in Icepack and CICE carefully and provide some feedback. We are in the process of updating several interfaces as part of a bgc upgrade, so depending on progress on that task, some revisions may be needed here for that too. But I don't think that will be a big problem, and we can work together to bring your changes into the code cleanly. More soon.

@zhaobin74
Copy link
Author

zhaobin74 commented Jun 18, 2024 •
edited
Loading

HI @zhaobin74. Thanks for putting these together. I've had a quick look and they look pretty reasonable. But I will go thru the modification in Icepack and CICE carefully and provide some feedback. We are in the process of updating several interfaces as part of a bgc upgrade, so depending on progress on that task, some revisions may be needed here for that too. But I don't think that will be a big problem, and we can work together to bring your changes into the code cleanly. More soon.

Thanks, @apcraig. All sounds good. Look forward to working with you and others on this PR.

@apcraig
Copy link
Contributor

apcraig commented Jul 22, 2024

Hi @zhaobin74, haven't forgotten about this. I'm trying to get an update to bgc into the code before we test/merge your modifications. This PR is high priority, sorry for the delays.

@zhaobin74
Copy link
Author

Hi @zhaobin74, haven't forgotten about this. I'm trying to get an update to bgc into the code before we test/merge your modifications. This PR is high priority, sorry for the delays.

Hi @apcraig, just back from leave. No problem, we can deal with it later.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
Driver/Interface
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@zhaobin74 @apcraig @mathomp4