-
Notifications
You must be signed in to change notification settings - Fork 2
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
Merge CICE-Consortium/Icepack main to E3SM-Project/Icepack main #35
base: main
Are you sure you want to change the base?
Commits on Oct 6, 2023
-
Add new picard nonconvergence messages (#464)
Co-authored-by: David Bailey <[email protected]> Co-authored-by: Elizabeth Hunke <[email protected]>
Configuration menu - View commit details
-
Copy full SHA for 0aa2305 - Browse repository at this point
Copy the full SHA 0aa2305View commit details
Commits on Oct 11, 2023
-
doc: mention code variables relating to 'calc_dragio' (#466)
* Add .readthedocs.yaml Copy CICE's readthedocs configuration as of CICE-Consortium/CICE@06282a53 (Update version to 6.4.2 (#864), 2023-09-08). * doc: mention code variables relating to 'calc_dragio' At the end of the "Ocean" section, we mention that 'dragio' can be computed from 'iceruf_ocn' and 'thickness_ocn_layer1', but do not mention these code variables, nor the 'calc_dragio' setting used to activate that computation. Mention the code variables next to their mathematical symbol, for more clarity.
Configuration menu - View commit details
-
Copy full SHA for 45da0b3 - Browse repository at this point
Copy the full SHA 45da0b3View commit details
Commits on Oct 12, 2023
-
icepack_parameters: don't recompute constants in icepack_query_parame…
…ters (#465) All parameters of icepack_parameters::icepack_query_parameters are intent(out), so it does not make sense to recompute constants at the end of that subroutine since no constants are changed. This superfluous call dates back to the introduction of icepack_query_parameters (then called icepack_query_constants) in 7646f2a (Migrate icepack_constants out of the columnphysics/constants directory..., 2017-10-04). Remove that call.
Configuration menu - View commit details
-
Copy full SHA for 182030d - Browse repository at this point
Copy the full SHA 182030dView commit details
Commits on Oct 13, 2023
-
Configuration menu - View commit details
-
Copy full SHA for aea58f3 - Browse repository at this point
Copy the full SHA aea58f3View commit details -
Remove _old options for tfrz_option (#468)
* Remove older "_old" tfrz_options, added for backwards compatibility Modify tfrz_option logic in icepack_sea_freezing_temperature to trap unsupported values * Update Icepack set_nml settings, remove _old from tfrz_option
Configuration menu - View commit details
-
Copy full SHA for f6989f1 - Browse repository at this point
Copy the full SHA f6989f1View commit details
Commits on Oct 16, 2023
-
Configuration menu - View commit details
-
Copy full SHA for 0c54812 - Browse repository at this point
Copy the full SHA 0c54812View commit details
Commits on Oct 18, 2023
-
Configuration menu - View commit details
-
Copy full SHA for 863b19c - Browse repository at this point
Copy the full SHA 863b19cView commit details -
Clarify documentation associated with namelist inputs (#470)
* Clarify documentation associated with namelist inputs Alphabetize cpl_frazil namelist documentation * Update documentation
Configuration menu - View commit details
-
Copy full SHA for 7a0d4e9 - Browse repository at this point
Copy the full SHA 7a0d4e9View commit details
Commits on Oct 27, 2023
-
Update 5-band dEdd to support test data (#472)
* Update 5-band dEdd to support test data Add an interpolation method in icepack_shortwave.F90 for rsnw Refactor portions of icepack_shortwave to improve robustness Add snicar and snicartest test cases * Update the 5-band snicar shortwave rsnw_snicar_tab interpolation This changes answers but QC tests pass. The new implementation checks whether the rsnw_snicar_tab is an array of integer values with deltas of value 1 (and sets the rsnw_snicar_chk variable). If so, it uses a shortcut to find the rsnw_snicar_tab bounds for interpolation, otherwise it calls the shortwave_search routine. In testing, the shortcut did not change performance much, but that could change in the future. * Clean up debug output * Refactor the logic to control rsnw table interpolation in the shortwave. Set a character string, rsnw_datatype, at initialization.
Configuration menu - View commit details
-
Copy full SHA for 6ad0f44 - Browse repository at this point
Copy the full SHA 6ad0f44View commit details -
Configuration menu - View commit details
-
Copy full SHA for 71093e6 - Browse repository at this point
Copy the full SHA 71093e6View commit details -
Configuration menu - View commit details
-
Copy full SHA for 84ff388 - Browse repository at this point
Copy the full SHA 84ff388View commit details
Commits on Oct 28, 2023
-
Configuration menu - View commit details
-
Copy full SHA for d1a42fb - Browse repository at this point
Copy the full SHA d1a42fbView commit details
Commits on Nov 14, 2023
-
correct ks units, clean up comments, bug fix for BL99 enthalpy calcul…
…ation (#476) * correct ks units, clean up comments, big fix for BL99 enthalpy calculation * make it pretty
Configuration menu - View commit details
-
Copy full SHA for b129416 - Browse repository at this point
Copy the full SHA b129416View commit details
Commits on Nov 17, 2023
-
Configuration menu - View commit details
-
Copy full SHA for f6ff8f7 - Browse repository at this point
Copy the full SHA f6ff8f7View commit details
Commits on Mar 1, 2024
-
Update pull request template, Update conda_macos debug flag (#484)
Update pull request template to ask for additional information about the PR. This information can and will be used during the squash merge process to produce more useful commit logs. Update Macros.conda_macos to remove ffpe-trap=invalid from debug flags. This flag causes nf90_create to fail with the latest version of the conda environment. This happens when debug flags are on and a test with netcdf is turned on. I believe this is a compiler error.
Configuration menu - View commit details
-
Copy full SHA for 3ffde67 - Browse repository at this point
Copy the full SHA 3ffde67View commit details -
Add gnuplot to the conda environment (#483)
* Add gnuplot to the conda environment This fix allows the timeseries.csh script to be used for Icepack standalone runs.
Configuration menu - View commit details
-
Copy full SHA for 7e529b1 - Browse repository at this point
Copy the full SHA 7e529b1View commit details
Commits on Apr 26, 2024
-
Add Tutorial to User Guide as Appendix (#485)
* add tutorial documentation * add tutorial * add tutorial * add tutorial * add tutorial * add tutorial * Minor clarifications and grammatical updates. --------- Co-authored-by: Elizabeth Hunke <[email protected]>
Configuration menu - View commit details
-
Copy full SHA for 74cc6f4 - Browse repository at this point
Copy the full SHA 74cc6f4View commit details
Commits on May 14, 2024
-
Update version to Icepack 1.4.1 (#486)
Update Copyright to 2024 in code and LICENSE file
Configuration menu - View commit details
-
Copy full SHA for 2fd2140 - Browse repository at this point
Copy the full SHA 2fd2140View commit details -
Configuration menu - View commit details
-
Copy full SHA for ae69b80 - Browse repository at this point
Copy the full SHA ae69b80View commit details
Commits on May 28, 2024
-
Update gnuplot, improve titles and fonts (#490)
Add run_testoutput script to generate release plots for Icepack
Configuration menu - View commit details
-
Copy full SHA for 083d6e3 - Browse repository at this point
Copy the full SHA 083d6e3View commit details
Commits on Jul 29, 2024
-
Update documentation for adding a tracer and the tutorial (#493)
Documentation is being update based on the Consortium workshop in 2024. The "adding a tracer" section has been updated as has the tutorial section related to adding a fluff tracer. An example set of code diffs for the tutorial is also includes as reference.
Configuration menu - View commit details
-
Copy full SHA for 1a820b4 - Browse repository at this point
Copy the full SHA 1a820b4View commit details
Commits on Aug 2, 2024
-
Port to NCAR's cluster, casper using the HTC nodes using standard cpus. This will support testing and development on another piece of hardware other than derecho and izumi and provides a good option for smaller test cases. Added intel, inteloneapi, and gnu compiler options. The -check debug option is very sensitive in this version of Inteloneapi, so it has been turned off.
Configuration menu - View commit details
-
Copy full SHA for 92be122 - Browse repository at this point
Copy the full SHA 92be122View commit details
Commits on Aug 7, 2024
-
Alternative congelation formulation following Plante et al. 2024 (#494)
Add congel_freeze namelist and add 'one-step' option to the default 'two-step' option. Namelist flag congel_freeze chooses which formulation to use. The original is ‘two-step’, since only the mushy boundary moves in the first step and the phase change happens in the next step. Plante et al. (‘one-step’) moves the boundary and performs the phase change in a single time step. Maintain 'two-step' as default for now.
Configuration menu - View commit details
-
Copy full SHA for 4c87095 - Browse repository at this point
Copy the full SHA 4c87095View commit details
Commits on Sep 15, 2024
-
This is a significant update in the BGC including refactoring Icepack interfaces. Deprecate skl BGC but leave code alone for now hoping we get help from the community to validate the latest code. Add BGC parameters to icepack_parameters.F90 Update BGC physics, consistent with E3SM-Project/E3SM#6457. Remove redundant arguments in BGC interfaces. icepack_aerosol.F90 revised subroutine update_snow_bgc icepack_algae.F90 revised subroutine zbio revised subroutine z_biogeochemistry revised subroutine algal_dyn add subroutine bgc_carbon_sum icepack_brine.F90 revise subroutine prepare_hbrine revise subroutine update_hbrine icepack_mechred.F90 add mbio calculation to subroutine ridge_shift add flux_bio calculation to subroutine ridge_ice icepack_therm_itd.F90 update calculation of dvssl and dvint in subroutine lateral_melt icepack_zbgc.F90 lots of stuff icepack_zbgc_shared.F90 lots of stuff Remove redundant arguments in non-BGC interfaces. icepack_atmo.F90 icepack_fsd.F90 icepack_isotope.F90 icepack_itd.F90 icepack_meltpond_topo.F90 icepack_mushy_physics.F90 icepack_snow.F90 icepack_therm_bl99.F90 icepack_therm_mushy.F90 icepack_therm_shared.F90 icepack_therm_vertical.F90 icepack_tracers.F90 icepack_wavefracspec.F90 Generalize merge_fluxes to make all arguments optional Fix bug in subroutine snow_redist computation of hsn_new when nslyr=1 Update the Icepack driver consistent with Icepack interface changes Update zbgc initialization in the Icepack driver, move bgc parameter intiialization to icepack_init_parameters, update icepack_init_zbgc call. Update some calls to icepack_warnings_setabort to add file and line number. Update warning package to improve OpenMP robustness. Fixes potential race conditions that show up when lots of output is produced. Modified congel implementation in subroutine thickness_changes in icepack_therm_vertical.F90 to recover bit-for-bit results. New congel and new bgc implementation were bit-for-bit independently, but when combining the changes, the intel compiler (with -O2) introduces non bit-for-bit changes (roundoff). Update bgc namelist defaults and settings in icepack_in Update bgc tracer sizing in set_env files Update testing, remove skl tests, add zaero tests. --------- Co-authored-by: Elizabeth Hunke <[email protected]> Co-authored-by: David Bailey <[email protected]> Co-authored-by: Nicole Jeffery <[email protected]>
Configuration menu - View commit details
-
Copy full SHA for 05ac0ec - Browse repository at this point
Copy the full SHA 05ac0ecView commit details
Commits on Sep 27, 2024
-
Update inteloneapi, cray, intel, nvhpc modules/compiler. Changes answers for inteloneapi and cray. Switch default Derecho queue from main to develop to support quicker turn around and lower costs. Develop is a shared queue. Error in the snow physics with the cray compiler needs further assessment, but suggest we merge this now as is. That error does not present itself in CICE with snow physics with the same cray compiler.
Configuration menu - View commit details
-
Copy full SHA for ba0bc0b - Browse repository at this point
Copy the full SHA ba0bc0bView commit details