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 Icepack for latest Consortium master, including advance snow physics #6

Merged
merged 11 commits into from
Sep 16, 2021

Conversation

DeniseWorthen
Copy link
Collaborator

See CICE Issue CICE-Consortium#37 for description

apcraig and others added 7 commits July 9, 2021 13:09
* new snow tracer implementation (no physics)

* snow redistribution testing options

* settings for 3 snow layers, the way Icepack wants them

* setenv correction

* add rhosmin, snwlvlfac to namelist, change snwredist opetion from 30percent to bulk, fix domain size

* add ice_snow module; compiles, no hooks from main code, module conversion for Icepack incomplete

* rename ice_snow.F90, add icepack_step_snow, call drain_snow, move adjust_enthalpy, add snowage parameters

* bug fix:  dsnow was not being aggregated from category values

* add calls to new snow physics routines

* call update_state, make optional arguments

* snow interactions with thermo (except dEdd)

* snow interactions in dEdd

* add meltsliq to ponds, clean up

* adding snwgrain namelist flag

* Bug fixes from MPAS-Dev/MPAS-Model#314

* constrain calculations based on configuration options, add diagnostics, initialize, debug, clean up

* make dsnow optional

* snow aging table for dry metamorphism

* env for snwgrain test

* snow documentation, first draft

* snow case settings

* fix step_therm1 interface and some documentation errors

* documentation corrections

* complete step_therm1 interface fix; bug fix in bgc diagnostics

* metamorphism updates to doc with notes for things needing to be checked against the code

* remove unused variable

* add snow tests to base_suite

* initialize snow tracer indices when unused; update documentation

* TRSNOW 0 when not using advanced snow physics

* fix snow restarts, clean up unused flags

* updating snow documentation

* adding snow namelist info to science guide

* update icepack to support snowtable better

* adjust parameter values, test options

* send rsnw to dEdd; limit rsnw below; fix snow SSL for z tracers

* updating snow options in icepack for consistency with cice

* reformulate ice-liquid tracer conversions in snow; limit use of rsnow in dEdd with snwgrain; correct rhos_effn; clean up

* another approach for ice/liquid tracer conversions in snow

* enforce mass conservation of snow ice and liquid tracers, to maintain consistency with rhos based snow volume transport

* create temporary array for rsnow in shortwave calls to avoid array-out-of-bounds error when snwgrain=F

* reset default/initial tracer values when snow disappears; some cleanup

* Bug fix for bulk redistribution precipitation factor.  Commented out shortwave modification for bulk redistribution - it should not be used for production runs without more careful analysis of the energy balance between level and ridged ice.

* Another bug fix for bulk redistribution precipitation factor - average alvl weighted by aice.  Reinstated shortwave modification for bulk redistribution - it works the same as for ITDrdg. Updated documentation.

* cleanup

* remove rnsw_dEdd array, load tracer instead; use rsnw_fall instead of rsnw_fresh in dEdd, set dEdd default value in namelist and tr_snow value in options

* Removed variables that were only for history output, instead using the tracer array directly; the snow_effective_density subroutine was then also unnecessary.

* initialize density tracer; fix history output for CICE

Co-authored-by: apcraig <anthony.p.craig@gmail.com>
apcraig and others added 4 commits August 30, 2021 17:17
* Add primitive netcdf history capability

- Add history_cdf namelist.  This turns on netcdf history files.
  Netcdf history files are written for each column at each timestep
  for a hardcoded set of fields.  There is no control of fields,
  frequency, or averaging.  History filenames are also hardwired in
  the code.
- History netcdf files require the USE_NETCDF C Preprocessor flag.  This
  is turned on by setting ICE_IOTYPE to netcdf in icepack.settings.  In
  addition, the env and Macros files for the machine have to support
  builds with netcdf.
- Add icedrv_history.F90.  Implements history capability.
- Add set_env.ionetcdf, set_nml.ionetcdf
- Add io_suite.ts

* update documentation

* fix badger machine files

* update conda_macos

* update documentation

* update travis testing to include netcdf

* update github actions suites

Co-authored-by: Elizabeth Hunke <eclare@lanl.gov>
…Also fixes nag issue introduced recently and detected on izumi (CICE-Consortium#369)
module unload hdf5-parallel
module unload netcdf-serial
module unload netcdf-h5parallel
module load hdf5-serial
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am curious why we unload and load the same module

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've never paid attention to these files for different tested machines since we don't use them. I don't know why the load/unload is happening.

@DeniseWorthen DeniseWorthen merged commit 29ee0ce into NOAA-EMC:emc/develop Sep 16, 2021
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.

4 participants