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

Initial icepack integration #5958

Merged
Merged
Changes from 1 commit
Commits
Show all changes
169 commits
Select commit Hold shift + click to select a range
d922306
add icepack submodule
eclare108213 Dec 5, 2022
a11e238
Merge branch 'eclare108213/seaice/icepack-integration' of github.com:…
eclare108213 Dec 5, 2022
98cd0af
remove extraneous Icepack entry from .gitmodules
eclare108213 Dec 5, 2022
9af2f7c
compile icepack with cmake
eclare108213 Dec 5, 2022
8a922a1
Merge branch 'E3SM-Project:master' into eclare108213/seaice/icepack-i…
eclare108213 Dec 7, 2022
d240501
Merge branch 'E3SM-Project:master' into eclare108213/seaice/icepack-i…
eclare108213 Dec 7, 2022
75325af
Initial integration of Icepack into MPAS-Seaice
akturner Sep 17, 2022
0df4339
Changes needed for BFB icepack/column pckg shortwave
akturner Nov 14, 2022
afe58d2
Add namelist option to run with either icepack or column package
akturner Nov 14, 2022
73f41c5
Update icepack interface for newer icepack commit
akturner Dec 7, 2022
80bb443
Changes for e3sm build
darincomeau Dec 9, 2022
5b1c863
Minor changes for existing E3SM consistency
darincomeau Dec 9, 2022
4ddee4a
Removing duplicate use calls
darincomeau Dec 9, 2022
2b5a9d7
Adding new config_column_physics_type namelist option to E3SM build n…
darincomeau Dec 9, 2022
bfab10f
Additional changes for E3SM build namelist
darincomeau Dec 9, 2022
4fb0fe0
Correcting erroneous 'use' in new namelist option
darincomeau Dec 9, 2022
d1de208
Correcting new namelist option type
darincomeau Dec 9, 2022
85146bf
Adding ifdefs to turn off icepack_step_radiation even when icepack is…
darincomeau Dec 9, 2022
e62effe
Changing 'gregorian_noleap' to 'noleap'
darincomeau Dec 13, 2022
a6a5afe
Changes to config_shortwave_type for icepack
darincomeau Dec 13, 2022
068b476
Changing tmp config shortwave_type to pointer
darincomeau Dec 15, 2022
c36c445
Adding local use_snow logical
darincomeau Dec 15, 2022
2e219f2
Adding missing config_use_snicar_ad pool call
darincomeau Dec 15, 2022
807b992
Fixing location of use_snow local logical, removing unused config_sni…
darincomeau Dec 15, 2022
85e3174
Reverting addition of ifdef statements
darincomeau Dec 15, 2022
2ad4b45
Merge pull request #1 from darincomeau/cherry-pick-from-akt
eclare108213 Dec 16, 2022
5dfc119
update from E3SM master
eclare108213 Dec 19, 2022
33d6cb0
Merge pull request #2 from eclare108213/update_E3SM_2
eclare108213 Dec 19, 2022
9669e94
updating icepack to latest version, cice-consortium/E3SM-icepack-init…
eclare108213 Dec 19, 2022
6bf020e
Merge pull request #3 from eclare108213/update_icepack_1
eclare108213 Dec 19, 2022
b49652f
allocate rsnow for use in icepack
eclare108213 Dec 20, 2022
dc3b176
Merge pull request #4 from eclare108213/allocate_rsnow
eclare108213 Dec 22, 2022
ee53d92
Merge branch 'master' of github.com:E3SM-Project/E3SM into update_E3SM_3
eclare108213 Jan 13, 2023
d913a2b
Merge pull request #5 from eclare108213/update_E3SM_3
eclare108213 Jan 13, 2023
01e5f2a
initial shortwave module changes
eclare108213 Feb 2, 2023
88a570a
Added step_therm1 from icepack to MPAS-Seaice
akturner Feb 22, 2023
1c6b78a
Merge branch 'akturner/seaice/icepack-step-therm1-integration' of git…
eclare108213 Mar 31, 2023
13e92c6
add config_salt_flux_coupling_type to namelist files
eclare108213 Mar 31, 2023
4f08e70
add config_floeshape and config_floediam to build-namelist
Mar 31, 2023
a0c36fe
fix accidentally deleted code
eclare108213 Mar 31, 2023
03020e8
add floeshape and floediam namelist options to build-namelist-group-l…
Mar 31, 2023
2e4618e
add default values for floeshape(0.66) and floediam(300.0) to namelis…
Mar 31, 2023
413dea3
add floeshape and floediam definitions to namelist_definition_mpassi.xml
Mar 31, 2023
93388c0
add floeshape and floediam namelist options to registry.xml
Mar 31, 2023
527e909
constants and configs; update config_atmos_boundary_method values
eclare108213 Apr 1, 2023
249a611
Merge pull request #9 from erinethomas/namelistMods_floediam_floeshape
eclare108213 Apr 1, 2023
0c952ae
Initialize Icepack constants using (E3SM/SHR) values in ice_constants…
eclare108213 Apr 3, 2023
82fe7ad
Merge pull request #10 from eclare108213/set_parameters
eclare108213 Apr 3, 2023
9b83524
Update branch from eclare108213/seaice/icepack-integration
eclare108213 Apr 3, 2023
03825c9
Move icepack_configure call earlier in the initialization. Clean up.
eclare108213 Apr 4, 2023
e9f7f5e
fix spelling error in comment
eclare108213 Apr 4, 2023
8dcd3c8
Update Icepack integration, mpas_seaice_icepack.F
apcraig Apr 6, 2023
5d06618
clean up associated with rebase
apcraig Apr 6, 2023
a4d2887
Merge pull request #12 from apcraig/snicarad
eclare108213 Apr 8, 2023
4e3bed3
Merge icepack-integration PR#12 and add warnings calls for therm1
eclare108213 Apr 9, 2023
8488f12
Merge pull request #11 from eclare108213/vertical_thermo
eclare108213 Apr 10, 2023
c91578e
Merge remote-tracking branch 'e3sm/master' into icepack-integration-m…
darincomeau Apr 12, 2023
e81ac33
Merge pull request #15 from darincomeau/icepack-integration-merge-202…
eclare108213 Apr 14, 2023
d9075d2
updating Icepack to hash 6ca316f, adding wlat for FSD
eclare108213 Apr 14, 2023
7435ba3
Adds changes for consistency with icepack and bugfix for boundary layer
njeffery Apr 28, 2023
7836b8b
Merge pull request #17 from E3SM-Project/njeffery/seaice/eclare-updat…
eclare108213 Apr 28, 2023
a4c5bd3
Merge commit '01e5f2a4f265976526e7aad67bd47b6efd98fa44' of github.com…
eclare108213 May 25, 2023
2978bdf
adding missing constants definitions for column configuration
eclare108213 May 25, 2023
79526bd
Merge pull request #16 from eclare108213/update_icepack_2
eclare108213 May 26, 2023
e69c167
updating Icepack to hash 2fc81b4
eclare108213 May 27, 2023
ffd5a47
Merge pull request #18 from eclare108213/update_icepack_3
eclare108213 May 31, 2023
95647ae
activate snicar in icepack, check values
eclare108213 Jun 1, 2023
5ef2ffa
Initial integration of icepack step_ridge
darincomeau Dec 21, 2022
b7095d5
Adding missing Tf argument to icepack_step_ridge call
darincomeau Jan 30, 2023
38d04c6
clean up warning and abort
eclare108213 Jun 2, 2023
d694da2
Merge pull request #20 from eclare108213/mechred
eclare108213 Jun 2, 2023
1addc7a
add -DUSE_SNICARHC for standalone testing
eclare108213 Jun 13, 2023
d25dc66
Merge pull request #19 from eclare108213/snicar_active
eclare108213 Jun 15, 2023
3384c3d
updating Icepack to hash b2b8066
eclare108213 Jul 7, 2023
eaaac15
Merge pull request #22 from eclare108213/update_icepack_4
eclare108213 Jul 7, 2023
67ed69a
Corrects use of snow flags and adds flag consistency checks
njeffery Jul 12, 2023
a9c8812
Put snow flag consistency checks in mpas_seaice_icepack
njeffery Jul 12, 2023
d205577
Merge pull request #23 from eclare108213/njeffery/seaice/add-step-sno…
eclare108213 Jul 13, 2023
77d1d8d
updating Icepack to #e8e7d7d
eclare108213 Jul 19, 2023
f8716bd
Merge pull request #24 from eclare108213/update_icepack_5
eclare108213 Jul 20, 2023
a53c3be
step_therm2 integration, bug fix in column
eclare108213 Jul 23, 2023
3caa764
revert ice_itd.F90 for CICE-QC testing
eclare108213 Jul 23, 2023
8309830
uncomment column itd changes, and informational comments
eclare108213 Jul 27, 2023
bf50a22
Merge pull request #25 from eclare108213/thermo_itd2
eclare108213 Jul 28, 2023
f0551b4
Adds mpassi-icepack interface for snow flag options
njeffery Aug 14, 2023
9408969
updating Icepack to hash e751022
eclare108213 Aug 21, 2023
413fd9f
Merge pull request #27 from eclare108213/update_icepack_6
eclare108213 Aug 21, 2023
7d19487
Change colpkg_ to icepack_ for init_itd, ice_strength; remove colpkg_…
eclare108213 Aug 22, 2023
e67d37a
call icepack_aggregate, clean up warnings calls, remove commented-out…
eclare108213 Aug 22, 2023
20e393d
replace colpkg_ with icepack_ for sea_freezing_temperature, liquidus_…
eclare108213 Aug 22, 2023
d19541b
remove seaice_column_ocean_mixed_layer; inline colpkg_enthalpy_snow, …
eclare108213 Aug 23, 2023
f6bf080
Merge pull request #28 from eclare108213/oddsandends1
eclare108213 Aug 24, 2023
acd21e9
Merge step-snow interface changes with current integration branch
njeffery Aug 24, 2023
f38b5b0
Changes the name of a snow config option
njeffery Aug 25, 2023
7e2cfd3
Moved get arrays outside of the if restart loop.
njeffery Aug 29, 2023
c65afc0
Merge pull request #29 from E3SM-Project/njeffery/seaice/merge-snow-i…
eclare108213 Sep 1, 2023
a41cafb
updating Icepack to hash cb0d946; fixes water and salt mass conservat…
eclare108213 Sep 15, 2023
01e3d6a
add config_frazil_coupling_type (cpl_frazil in icepack)
eclare108213 Sep 15, 2023
ea68ac2
fix Registry description field
eclare108213 Sep 15, 2023
4b6febf
Merge pull request #30 from eclare108213/update_icepack_7
eclare108213 Sep 18, 2023
89e2c3f
Remove redundant column package tracer code
eclare108213 Sep 18, 2023
39478ca
cleanup column -> icepack, BFB
eclare108213 Sep 19, 2023
f7365e5
Merge pull request #31 from eclare108213/tracers1
eclare108213 Sep 20, 2023
8eec0c6
Merge remote-tracking branch 'e3sm/master' into icepack-integration-m…
darincomeau Sep 20, 2023
f35b39c
Update to allow compilation and running within existing constant regime
proteanplanet Sep 21, 2023
1171641
interim commit, builds, runs, BFB
eclare108213 Sep 21, 2023
bba2e9e
interim commit, BFB
eclare108213 Sep 21, 2023
db2c4ef
interim commit, BFB
eclare108213 Sep 21, 2023
9ed8e48
Merge pull request #32 from darincomeau/icepack-integration-merge-202…
eclare108213 Sep 22, 2023
f0d4df3
cleaning up
eclare108213 Sep 22, 2023
035521f
Merge branch 'move_constants' of github.com:eclare108213/E3SM into mo…
eclare108213 Sep 22, 2023
838008f
define a few more constants in MPAS-SI, clean up
eclare108213 Sep 23, 2023
872ce33
use seaice_constants instead of ice_constants_colpkg
eclare108213 Sep 23, 2023
511c002
Merge pull request #33 from eclare108213/move_constants2
eclare108213 Sep 23, 2023
57c9dfa
optionally call icepack routines; fix threading bug
eclare108213 Sep 24, 2023
34fc863
optionally call icepack routines; clean up constants
eclare108213 Sep 24, 2023
3e94f62
simplify icepack interface in MPAS-SI driver modules
eclare108213 Sep 25, 2023
a3b23ec
call icepack interface routines directly with warnings call; clean up
eclare108213 Sep 25, 2023
c364095
updating Icepack to hash 78286bf
eclare108213 Sep 26, 2023
e852a02
Merge pull request #34 from eclare108213/prescribedice1
eclare108213 Sep 26, 2023
ef0a823
components/mpas-seaice/bld/build-namelist
erinethomas Sep 26, 2023
0368921
components/mpas-seaice/bld/build-namelist-section
erinethomas Sep 26, 2023
2d20e48
components/mpas-seaice/bld/namelist_files/namelist_defaults_mpassi.xml
erinethomas Sep 26, 2023
d0b1f22
components/mpas-seaice/bld/namelist_files/namelist_definition_mpassi.xml
erinethomas Sep 26, 2023
ea65d16
components/mpas-seaice/bld/namelist_files/namelist_definition_mpassi.xml
erinethomas Sep 26, 2023
d8633ad
abort if FSD turned on.
Sep 28, 2023
ba13054
Add floe size distribution namelist option to registry
Sep 28, 2023
584443d
Updated to include dimension namelist option for the floe size
Sep 28, 2023
6b7682d
Merge pull request #36 from erinethomas/FSD_flag_only
eclare108213 Sep 28, 2023
9924ffe
additional calls to icepack instead of colpkg. BFB
eclare108213 Sep 28, 2023
c83a3c3
unify pi. BFB
eclare108213 Sep 29, 2023
28656e0
deprecate cesm ponds
eclare108213 Sep 29, 2023
90f650e
deprecate 0-layer thermo and zsalinity (partially). BFB
eclare108213 Sep 29, 2023
d29929b
check emissivity value when coupled; update authorship. BFB
eclare108213 Sep 29, 2023
b52b0e8
fix config checks and comments for deprecated code. BFB
eclare108213 Sep 29, 2023
cdf259a
wrap use shr_const_mod in coupled ifdef
eclare108213 Sep 29, 2023
c7e2666
add line continuation for standalone constants
eclare108213 Sep 29, 2023
92b264e
update Makefile and constants for standalone
eclare108213 Sep 29, 2023
35980d6
specify string length for icepack warnings
eclare108213 Sep 30, 2023
50b3913
Merge pull request #37 from eclare108213/physics_cleanup
eclare108213 Sep 30, 2023
51d5c60
updating Icepack to has 96f2fc7
eclare108213 Oct 1, 2023
e300846
Merge pull request #38 from eclare108213/update_icepack_8
eclare108213 Oct 1, 2023
8bd8a34
rename config_pond_flushing_timescale, fix spelling in config_ridigin…
eclare108213 Oct 1, 2023
ce3f978
add shortwave redistribution config options
eclare108213 Oct 1, 2023
64aa64f
add config_macro_drainage_timescale
eclare108213 Oct 2, 2023
e429dbf
Merge pull request #39 from eclare108213/add_configs
eclare108213 Oct 3, 2023
c29358c
Switch to dragio being declared as config_ice_ocean_drag_coefficient …
Oct 6, 2023
e0e4bc0
Corrections to ColPkg warning messages
Oct 6, 2023
200aa67
Removed double accounting for FSD
Oct 6, 2023
156b5b3
Code fix for log write
Oct 6, 2023
140dac1
Addition of config_snow_thermal_conductivity namelist option
Oct 6, 2023
0fbfc88
Correction, adding snow thermal conductivity to column package iniati…
Oct 6, 2023
b6dc969
Addition of comment in constants
Oct 6, 2023
d35bb82
Corrected warning write statement for ksno
Oct 6, 2023
06a034b
Further addition of config_ice_ocean_drag_coefficient and config_snow…
Oct 8, 2023
01d79a5
Bug fix - removal of line continuation
Oct 8, 2023
0b2fcd2
Replace config_use_column_package with config_use_column_physics to a…
Oct 8, 2023
eecfaf4
Merge pull request #40 from eclare108213/mpas_namelist
eclare108213 Oct 9, 2023
b4fbcd7
Merge pull request #41 from eclare108213/config_colpkg_physics
eclare108213 Oct 9, 2023
b5a16aa
make Icepack the default column physics package
eclare108213 Oct 10, 2023
94dadc0
Merge branch 'eclare108213/seaice/icepack-integration' of github.com:…
eclare108213 Oct 10, 2023
a8b5b59
Merge pull request #42 from eclare108213/icepack_default
eclare108213 Oct 11, 2023
79cc95c
updating icepack to hash 8fad768 on main
eclare108213 Oct 13, 2023
dc5947c
Merge pull request #43 from eclare108213/move_submodule
eclare108213 Oct 13, 2023
08a8df3
Fix to prescribed ice mode for F-case simulations
Oct 20, 2023
b6a0f2c
Merge pull request #44 from eclare108213/proteanplanet/seaice/prescribed
proteanplanet Oct 20, 2023
fc4d146
Move some description changes from bld files to Registry
jonbob Oct 25, 2023
e0d08e9
Update bld files to match Registry changes, using automated scripts
jonbob Oct 25, 2023
52b0551
Merge pull request #45 from eclare108213/jonbob/seaice/update-bld-files
eclare108213 Oct 26, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
updating Icepack to has 96f2fc7
eclare108213 committed Oct 1, 2023

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit 51d5c609b41a2993b0336722017fce47d9f12099