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

Add subglacial discharge at grounding line #6508

Merged
merged 73 commits into from
Aug 29, 2024
Merged

Add subglacial discharge at grounding line #6508

merged 73 commits into from
Aug 29, 2024

Commits on Jul 10, 2024

  1. resolved: registry topodrag

    @irenavankova
    irenavankova committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    d56618a View commit details
    Browse the repository at this point in the history

  2. resolved: gitignore

    @irenavankova
    irenavankova committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    f57b015 View commit details
    Browse the repository at this point in the history

  3. subglacial runoff for tracers, part 1

    @irenavankova
    irenavankova committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    b4198e8 View commit details
    Browse the repository at this point in the history

  4. subglacial runoff for tracers, part 2 - registry

    @irenavankova
    irenavankova committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    5cb8a57 View commit details
    Browse the repository at this point in the history

  5. subglacial runoff freezing temperature at landicepressure

    @irenavankova
    irenavankova committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    b8f6d4f View commit details
    Browse the repository at this point in the history

  6. resolved: compsets tmix

    @irenavankova
    irenavankova committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    cf5c31a View commit details
    Browse the repository at this point in the history

  7. typo

    @irenavankova
    irenavankova committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    0fccd70 View commit details
    Browse the repository at this point in the history

  8. more compsets

    @irenavankova
    irenavankova committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    f820afb View commit details
    Browse the repository at this point in the history

  9. typo: remainingFluxSubglacialRunoff

    @irenavankova
    irenavankova committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    71dc2ee View commit details
    Browse the repository at this point in the history

  10. updated sg units

    @irenavankova
    irenavankova committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    2637229 View commit details
    Browse the repository at this point in the history

  11. change config_flux_attenuation_coefficient_subglacial_runoff default … 

    …to 1 mm
    @irenavankova
    irenavankova committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    98dc48b View commit details
    Browse the repository at this point in the history

  12. add namelist option to include some parts of runoff only: config_use_… 

    …SGR_opt
    @irenavankova
    irenavankova committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    2396978 View commit details
    Browse the repository at this point in the history

  13. more basic compsets

    @irenavankova
    irenavankova committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    c52d123 View commit details
    Browse the repository at this point in the history

  14. forgotten bld

    @irenavankova
    irenavankova committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    9b786dd View commit details
    Browse the repository at this point in the history

  15. no sg in kpp option

    @irenavankova
    irenavankova committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    de04001 View commit details
    Browse the repository at this point in the history

  16. config_use_SGR_opt -1 correction

    @irenavankova
    irenavankova committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    0ab2384 View commit details
    Browse the repository at this point in the history

  17. config read in forcing

    @irenavankova
    irenavankova committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    81d9488 View commit details
    Browse the repository at this point in the history

  18. sgr_flux_vertical_location and SGR to sgr

    @irenavankova
    irenavankova committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    4745779 View commit details
    Browse the repository at this point in the history

  19. more sgr testing options for TS separation

    @irenavankova
    irenavankova committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    e55b516 View commit details
    Browse the repository at this point in the history

  20. resolved: conservation check

    @irenavankova
    irenavankova committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    9179ab0 View commit details
    Browse the repository at this point in the history

  21. removed redundant removedSubglacialRunoffFlux

    @irenavankova
    irenavankova committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    af89287 View commit details
    Browse the repository at this point in the history

  22. correct sgr units in flux add up

    @irenavankova
    irenavankova committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    fe631c5 View commit details
    Browse the repository at this point in the history

  23. energy conservation check

    @irenavankova
    irenavankova committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    957d8b2 View commit details
    Browse the repository at this point in the history

  24. resolved: conservation check E3SM-Project#2

    @irenavankova
    irenavankova committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    ecb0658 View commit details
    Browse the repository at this point in the history

  25. salt: added tracersSurfaceFluxPool definition

    @irenavankova
    irenavankova committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    a430272 View commit details
    Browse the repository at this point in the history

  26. typo in print sgheatflux

    @irenavankova
    irenavankova committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    7c404b9 View commit details
    Browse the repository at this point in the history

  27. add subglacial to kpp in diagnostics

    @irenavankova
    irenavankova committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    e89e854 View commit details
    Browse the repository at this point in the history

  28. resolved: fris meshes

    @irenavankova
    irenavankova committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    52a4758 View commit details
    Browse the repository at this point in the history

  29. cleanup

    @irenavankova
    irenavankova committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    c6a0104 View commit details
    Browse the repository at this point in the history

  30. resolved: fris meshes E3SM-Project#2

    @irenavankova
    irenavankova committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    0c70aab View commit details
    Browse the repository at this point in the history

  31. changed sgr kpp default to 1 = use

    @irenavankova
    irenavankova committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    cdc60af View commit details
    Browse the repository at this point in the history

  32. change config_sgr_flux_vertical_location default to bottom

    @irenavankova
    irenavankova committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    1664002 View commit details
    Browse the repository at this point in the history

  33. rmv conservation check on sgr

    @irenavankova
    irenavankova committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    f0e802d View commit details
    Browse the repository at this point in the history

  34. rmv conservation check on sgr buildnml

    @irenavankova
    irenavankova committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    ea8bb59 View commit details
    Browse the repository at this point in the history

  35. rmv conservation check on sgr buildnml E3SM-Project#2

    @irenavankova
    irenavankova committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    e969c31 View commit details
    Browse the repository at this point in the history

  36. pkg change in bld

    @irenavankova
    irenavankova committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    800961c View commit details
    Browse the repository at this point in the history

  37. pkg in driver and registry

    @irenavankova
    irenavankova committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    fa7849c View commit details
    Browse the repository at this point in the history

  38. fix group for sgr in namelist_definition_mpaso

    @irenavankova
    irenavankova committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    b07587b View commit details
    Browse the repository at this point in the history

  39. sgr pkg in shared folder, add loops

    @irenavankova
    irenavankova committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    f1b13ba View commit details
    Browse the repository at this point in the history

  40. pkg dataSubglacialRunoffFluxPKG into registry variables

    @irenavankova
    irenavankova committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    9b3e339 View commit details
    Browse the repository at this point in the history

  41. add conservation registry and streams

    @irenavankova
    irenavankova committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    5ea51b2 View commit details
    Browse the repository at this point in the history

  42. try copy mpas_ocn_conservation_check.F

    @irenavankova
    irenavankova committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    3619001 View commit details
    Browse the repository at this point in the history

  43. update dsgr files

    @irenavankova
    irenavankova committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    26720b5 View commit details
    Browse the repository at this point in the history

  44. remove redundant compsets

    @irenavankova
    irenavankova committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    21a593e View commit details
    Browse the repository at this point in the history

  45. fix typo in dsgr filename

    @irenavankova
    irenavankova committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    fe4380c View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2024

  1. fix omp and acc added loops

    @irenavankova
    irenavankova committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    8f147f9 View commit details
    Browse the repository at this point in the history

  2. fix omp in tendency

    @irenavankova
    irenavankova committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    43c3190 View commit details
    Browse the repository at this point in the history

  3. add sgr fail if bad string option

    @irenavankova
    irenavankova committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    89c14b8 View commit details
    Browse the repository at this point in the history

  4. add line

    @irenavankova
    irenavankova committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    7491a83 View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2024

  1. Update components/mpas-ocean/src/Registry.xml description 

    Co-authored-by: Carolyn Begeman <cbegeman@lanl.gov>
    @irenavankova @cbegeman
    irenavankova and cbegeman authored Jul 12, 2024
    Configuration menu
    Copy the full SHA
    a4209e4 View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2024

  1. rename config_sgr_salinity to config_sgr_salinity_prescribed

    @irenavankova
    irenavankova committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    c8f15f5 View commit details
    Browse the repository at this point in the history

  2. change config_use_sgr_opt_property from character to logical

    @irenavankova
    irenavankova committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    307b4d0 View commit details
    Browse the repository at this point in the history

  3. change config_use_sgr_opt_kpp to logical variable

    @irenavankova
    irenavankova committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    f6cbc38 View commit details
    Browse the repository at this point in the history

  4. Move checking for valid string in config_sgr_flux_vertical_location t… 

    …o an init routine
    @irenavankova
    irenavankova committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    387e9f2 View commit details
    Browse the repository at this point in the history

  5. set config_sgr_flux_vertical_location to bottom in namelist_defaults_… 

    …mpaso.xml for consistency with Registry
    @irenavankova
    irenavankova committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    c1616dd View commit details
    Browse the repository at this point in the history

  6. Change subglacialRunoffFlux into mass flux from volume flux for consi… 

    …stency with riverRunoffFlux and reference density, update DSGR files
    @irenavankova
    irenavankova committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    b452495 View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2024

  1. introduce separate subroutine ocn_diagnostic_solve_surfaceLayer_subgl… 

    …acialRunoff
    @irenavankova
    irenavankova committed Jul 17, 2024
    Configuration menu
    Copy the full SHA
    3b0dca4 View commit details
    Browse the repository at this point in the history

  2. correct extra delete

    @irenavankova
    irenavankova committed Jul 17, 2024
    Configuration menu
    Copy the full SHA
    7fa3a50 View commit details
    Browse the repository at this point in the history

  3. remove &

    @irenavankova
    irenavankova committed Jul 17, 2024
    Configuration menu
    Copy the full SHA
    579e3dd View commit details
    Browse the repository at this point in the history

Commits on Jul 21, 2024

  1. make separate subroutines whenever subglacial needs to be in subrouti… 

    …ne argument
    @irenavankova
    irenavankova committed Jul 21, 2024
    Configuration menu
    Copy the full SHA
    f78062d View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2024

  1. fix function call typos

    @irenavankova
    irenavankova committed Jul 22, 2024
    Configuration menu
    Copy the full SHA
    9ff4253 View commit details
    Browse the repository at this point in the history

  2. more new subrutines with _subglacial_runoff

    @irenavankova
    irenavankova committed Jul 22, 2024
    Configuration menu
    Copy the full SHA
    476908c View commit details
    Browse the repository at this point in the history

  3. fix function call typo _subglacial_runoff

    @irenavankova
    irenavankova committed Jul 22, 2024
    Configuration menu
    Copy the full SHA
    5a54e97 View commit details
    Browse the repository at this point in the history

  4. fix timer for sgr

    @irenavankova
    irenavankova committed Jul 22, 2024
    Configuration menu
    Copy the full SHA
    bdd8761 View commit details
    Browse the repository at this point in the history

  5. corrected subglacialRunoffFlux add up in conservation check so that i… 

    …t is as mass, not volume flux
    @irenavankova
    irenavankova committed Jul 22, 2024
    Configuration menu
    Copy the full SHA
    0b72d75 View commit details
    Browse the repository at this point in the history

  6. Change if statement for config_sgr_flux_vertical_location init check 

    Co-authored-by: Carolyn Begeman <cbegeman@lanl.gov>
    @irenavankova @cbegeman
    irenavankova and cbegeman committed Jul 22, 2024
    Configuration menu
    Copy the full SHA
    00fc261 View commit details
    Browse the repository at this point in the history

Commits on Jul 23, 2024

  1. change author on new subroutines

    @irenavankova
    irenavankova committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    77feb92 View commit details
    Browse the repository at this point in the history

Commits on Jul 25, 2024

  1. Make bld files consistent with Registry

    @jonbob
    jonbob committed Jul 25, 2024
    Configuration menu
    Copy the full SHA
    0288938 View commit details
    Browse the repository at this point in the history

  2. Correct DSGR file name 

    Co-authored-by: Xylar Asay-Davis <xylarstorm@gmail.com>
    @irenavankova @xylar
    irenavankova and xylar authored Jul 25, 2024
    Configuration menu
    Copy the full SHA
    48cee50 View commit details
    Browse the repository at this point in the history

  3. Corrected authorship

    @irenavankova
    irenavankova committed Jul 25, 2024
    Configuration menu
    Copy the full SHA
    5a0f284 View commit details
    Browse the repository at this point in the history

  4. Added DSGR to stealth feature tests

    @irenavankova
    irenavankova committed Jul 25, 2024
    Configuration menu
    Copy the full SHA
    9ddd011 View commit details
    Browse the repository at this point in the history

Commits on Jul 29, 2024

  1. added package condition in tendency tracers

    @irenavankova
    irenavankova committed Jul 29, 2024
    Configuration menu
    Copy the full SHA
    24f24b8 View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2024

  1. Revert changes to .gitignore

    @xylar
    xylar committed Aug 26, 2024
    Configuration menu
    Copy the full SHA
    624d9ac View commit details
    Browse the repository at this point in the history