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

Update InteRFACE Fork #1

Merged
merged 7 commits into from
Aug 27, 2020

Conversation

proteanplanet
Copy link

@proteanplanet proteanplanet commented Aug 27, 2020

For detailed information about submitting Pull Requests (PRs) to the CICE-Consortium,
please refer to: https://github.com/CICE-Consortium/About-Us/wiki/Resource-Index#information-for-developers

This updates the fork to the current CICE Consortium master.

apcraig and others added 7 commits August 7, 2020 17:17
* update icepack to 4c42a82

* remove two failing test configurations with iobinary due to bathymetry netcdf file requirements
* updated orbital calculations needed for cesm

* fixed problems in updated orbital calculations needed for cesm

* update CICE6 to support coupling with UFS

* put in changes so that both ufsatm and cesm requirements for potential temperature and density are satisfied

* update icepack submodule

* Revert "update icepack submodule"

This reverts commit e70d1ab.

* update comp_ice.backend with temporary ice_timers fix

* Fix threading problem in init_bgc

* Fix additional OMP problems

* changes for coldstart running

* Move the forapps directory

* remove cesmcoupled ifdefs

* Fix logging issues for NUOPC

* removal of many cpp-ifdefs

* fix compile errors

* fixes to get cesm working

* fixed white space issue

* Add restart_coszen namelist option

* Update NUOPC cap to work with latest CICE6 master

* nuopc,cmeps or s2s build updates

* fixes for dbug_flag

* Update nuopc2 to latest CICE master

* Fix some merge problems

* Fix dbug variable

* Manual merge of UFS changes

Co-authored-by: Mariana Vertenstein <mvertens@ucar.edu>
Co-authored-by: apcraig <anthony.p.craig@gmail.com>
Co-authored-by: Denise Worthen <denise.worthen@noaa.gov>
…sed. The current construction did not use the calculated values as they were defined private and overwritten at each i/j (#507)
* deprecate upwind advection

* fix diagnostic info

* remove single quotes

* error message if upwind is used
The documentation states that this test case sets 'coriolis' to zero,
but 'configuration/scripts/options/set_nml.box2001' sets 'coriolis' to 'constant'.
Fix the documentation to be in line with the code.

While at it, add the correct unit for the Coriolis parameter (in both places
where it appears in the documentation).

Closes #509

Reported-by: Jean-François Lemieux <jean-francois.lemieux@canada.ca>
@proteanplanet proteanplanet self-assigned this Aug 27, 2020
@proteanplanet proteanplanet merged commit 00ec763 into Arctic-InteRFACE:master Aug 27, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants