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

A new driver/coupler for GEOS-ESM #959

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

A new driver/coupler for GEOS-ESM #959

wants to merge 89 commits into from

Conversation

zhaobin74
Copy link

PR checklist

  • Short (1 sentence) summary of your PR:
    This PR provides a new driver/coupler to NASA GMAO's 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.
    Full 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 Icepack or any other models?
    • Yes
    • No
  • Does this PR update the Icepack submodule? If so, the Icepack submodule must point to a hash on Icepack's main branch.
    • 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/. A test build of the technical docs will be performed as part of the PR testing.)
    • 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 a new driver for GEOS-ESM under drivers/mapl/geos
    • Adds a separate land sea mask to run thermodynamics ONLY
    • When proper, use GEOSCOUPLED macro to isolate the relevant code specific to GEOS
    • Depends on Coupling support for GEOS-ESM Icepack#491

Hi Consortium, this PR is two years of efforts to bring in CICE6/Icepack to GEOS-ESM coupled model. We have been successfully using it in our coupled GEOS-MOM6-CICE6 experiments. I appreciate your review and feedbacks and am happy to improve it along the way. Thank you.

@zhaobin74
added customized machine files for discover
4666242
@zhaobin74
added discover machine in batch and launch
d2410e8
@zhaobin74
tweak include and lib options for discover
7fd4046
@zhaobin74
fix the input data directory
b85f95a
@zhaobin74
fix mpirun command
e7f3995
@zhaobin74
added mapl geos driver
1e95998
@zhaobin74
added mpi comm to init arguments
50701db
@zhaobin74
added run module
9a9d512
@zhaobin74
added a new module
0a19d70
@zhaobin74
added import_export module
b0ccb02
@zhaobin74
work on importing
28acfe0
@zhaobin74
finishing import_thermo1 and related moddule changes
477fffc
@zhaobin74
continue importing/exporting stuff
1af7127
@zhaobin74
finishing export_thermo1
1525271
@zhaobin74
added ifdef to protect additional arguments
98e3f4b
@zhaobin74
remove icepack from submodule
0f4e7ea
@zhaobin74
add additional exchange fields
aa3a6b0
@zhaobin74
fixed compilation errors
5da104d
@zhaobin74
change init/init_calendar interface to take in coupled model's date/time
807c7dc
@zhaobin74
receive layout information from coupler
dc16b5f
@zhaobin74
add radiation call in fast_physics
eaeebd8
@zhaobin74
prevent cice from stopping or dumping restart when coupled to geos
ec0923f
@zhaobin74
allow a new type of grid which resets tmask
bc05d19
@zhaobin74
allow albedo and thermo done on non-ocean points (tmask == 0); to be …
25b92fc 
…tested
@zhaobin74
export albedos to geos
52cbbf7
@zhaobin74
import sst and sss from surfstate
7c736ee
@zhaobin74
fixed a bug; feed frzmlt from coupler
ff6180f
@zhaobin74
resolved inconsistent value of MAPL_TICE and Tffresh
9ad8624
@zhaobin74
reset some icepack parameters using MAPL values
f1d6fea
@zhaobin74
disable some ice_debug calls to focus on thermo only
03656df
@zhaobin74
import ssh and compute ss_tlt* terms
0233286
@zhaobin74
add importing currents and exporting ice-ocean stress and ice vel
a2206d2
@zhaobin74
fix alncnt computation; do not use netsw condition for ccsm3 type alb…
201f5ba 
…edo scheme
@zhaobin74
fixed a bug of fsurf not getting assigned values
0bbc6a2
@zhaobin74
merged with CICE6.4.1; conflicts resolved and to be tested
7be0e36
@zhaobin74
update comments to 6.4.1
f812b40
@zhaobin74
revert scale_flux back to original version; geos coupler does not use…
53d3bca 
… it explicitly
@zhaobin74
fixed regression issue by adding opmask in conitional if
21d4f0a
@zhaobin74
changes to go with refactored icepack code
4b083b2
@zhaobin74
additions/changes to make test(suites) runs on discover
5348ece
@zhaobin74
add GEOS macro to isolate extra arguments
8061be3
@zhaobin74
correct halo_update for coupling to GEOS
dabdd6b
@zhaobin74
enable C-EVP by importing MOM6 C-grid currents (#2)
45e3382 
* first attempt at enabling c-evp

* corrected n/e mask; set u/vocn properly
@zhaobin74
make cice6 dump intermediate restart (#3)
ae59cc0 
* add passing optional time stamp to ice_checkpoint

* make ice_checkpoint accessible by the plug
@zhaobin74
keep allland blocks when coupling to GEOS-ESM
a5e75e6
@zhaobin74
Merge pull request #4 from GEOS-ESM/feature/zhaobin74/stop-landblock-…
771d550 
…elimination

keep all-land blocks when coupling to GEOS-ESM
@zhaobin74
add support for rewinding thermo states (#5)
b4caf80 
* move advance_calendar into ice_step such that only corrector step moves dates forward

* a module for recording and restoring thermo state added

* add protection for trcrn_save being not allocated

* need to save addtional states to restore later; turn on print out

* zero out many fluxes which could have accumulated during predictor step
@zhaobin74
merged with CICE main post 650; to be built and tested
e85361e
@zhaobin74
remove deprecated vars and routines from geos driver
e192827
@zhaobin74
more fixes for driver after merging post 650
1fc530b
@zhaobin74
fix halo update of u/vocn and sstlt terms based on B or C ice grid
1b3015f
@zhaobin74
Merge pull request #6 from GEOS-ESM/feature/zhaobin74/merge-main-post650
d7b5971 
merge upstream main post v6.5.0
@zhaobin74
remove debugging facility code
2af5ee5
@zhaobin74
restore .gitmodules file
ebbbd3f
@zhaobin74
add missing comments on GEOS input fields
16a6f29
@zhaobin74
corrected comments on GEOS inputs
65abb61
@zhaobin74
fill in fsw from coupler fields
7eb5e71
@apcraig apcraig self-assigned this Aug 8, 2024
@apcraig apcraig self-requested a review August 8, 2024 17:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@apcraig apcraig Awaiting requested review from apcraig

At least 1 approving review is required to merge this pull request.

Assignees

@apcraig apcraig

Labels
Drivers/coupling
Projects
None yet
Milestone
No milestone
Development

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