Skip to content

Update CICE for Consortium/main #1879

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

Closed
DeniseWorthen wants to merge 57 commits into from
Closed

Update CICE for Consortium/main #1879

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
8c0b608
hera.intel testing shows
DeniseWorthen Jan 6, 2023
3619de3
confirm cice testb16d7fd is b4b for all datm/cpld tests
DeniseWorthen Jan 9, 2023
11016e4
Merge branch 'ufs-community:develop' into feature/updcice
DeniseWorthen Jan 9, 2023
a8cacb3
update CICE
DeniseWorthen Jan 9, 2023
4eaf074
fix alignments in rt.conf, rt_gnu.conf
DeniseWorthen Jan 10, 2023
32d5ff2
Merge branch 'ufs-community:develop' into feature/updcice
DeniseWorthen Jan 12, 2023
adc486b
update CICE (no code changes)
DeniseWorthen Jan 17, 2023
d3b2469
Merge branch 'ufs-community:develop' into feature/updcice
DeniseWorthen Jan 17, 2023
45c851b
Merge branch 'ufs-community:develop' into feature/updcice
DeniseWorthen Jan 20, 2023
742f77c
add new BL_DATE
jkbk2004 Jan 20, 2023
c867e50
[AutoRT] hera.gnu Job Completed.
BrianCurtis-NOAA Jan 20, 2023
45130a8
[AutoRT] hera.intel Job Completed.
BrianCurtis-NOAA Jan 20, 2023
0e5d6a0
[AutoRT] orion.intel Job Completed.
BrianCurtis-NOAA Jan 20, 2023
5e3fefb
[AutoRT] jet.intel Job Completed.
BrianCurtis-NOAA Jan 21, 2023
9fbf65a
Acorn Intel RT Log
BrianCurtis-NOAA Jan 21, 2023
eba063d
add cheyenne intel.gnu RT logs: passed
jkbk2004 Jan 22, 2023
e8227ed
add gaea.intel RT log: passed
jkbk2004 Jan 22, 2023
e5c62f7
update CICE and revert gitmodules
DeniseWorthen Jan 23, 2023
d850095
Merge branch 'develop' into feature/updcice
DeniseWorthen Mar 22, 2023
c0a04c4
update CICE gitmodule
DeniseWorthen Mar 22, 2023
4dd3f5c
Merge branch 'ufs-community:develop' into feature/updcice
DeniseWorthen Mar 24, 2023
fa7f4f9
Merge branch 'ufs-community:develop' into feature/updcice
DeniseWorthen Mar 28, 2023
ae96b23
[AutoRT] cheyenne.gnu Job Completed.
epic-cicd-jenkins Mar 28, 2023
b2907f0
[AutoRT] hera.intel Job Completed.
jkbk2004 Mar 28, 2023
6e55f74
[AutoRT] cheyenne.intel Job Completed.
epic-cicd-jenkins Mar 28, 2023
dd343b7
[AutoRT] hera.gnu Job Completed.
jkbk2004 Mar 28, 2023
74b1688
add orion.intel RT logs: passed
zach1221 Mar 28, 2023
23d0923
add jet.intel RT logs: passed
zach1221 Mar 29, 2023
44cc9da
[AutoRT] gaea.intel Job Completed.
jkbk2004 Mar 29, 2023
e77011e
Acorn Intel RT Log
BrianCurtis-NOAA Mar 29, 2023
2cf77db
Merge remote-tracking branch 'origin/develop' into feature/updcice
DeniseWorthen Jul 24, 2023
41fc6f1
update CICE
DeniseWorthen Jul 24, 2023
e1569a4
all tests using CICE pass
DeniseWorthen Jul 24, 2023
2f9b5e2
change freq in for ice_diag.d global values
DeniseWorthen Jul 24, 2023
0654e53
Merge remote-tracking branch 'origin/develop' into feature/updcice
DeniseWorthen Jul 25, 2023
75f3eb4
remove unused history* settings
DeniseWorthen Jul 25, 2023
ea93c1d
update CICE
DeniseWorthen Jul 25, 2023
7829551
Merge branch 'ufs-community:develop' into feature/updcice
DeniseWorthen Jul 26, 2023
9276819
Merge branch 'ufs-community:develop' into feature/updcice
DeniseWorthen Jul 27, 2023
5521557
Merge branch 'ufs-community:develop' into feature/updcice
DeniseWorthen Jul 28, 2023
83688c2
Merge branch 'ufs-community:develop' into feature/updcice
DeniseWorthen Jul 31, 2023
0c40396
[AutoRT] hera Job Completed.
epic-cicd-jenkins Aug 2, 2023
ff7a595
[AutoRT] jet Job Completed.
epic-cicd-jenkins Aug 2, 2023
3dddfd8
add orion RT logs: passed
zach1221 Aug 2, 2023
c90b34a
add gaea RT logs: passed
zach1221 Aug 2, 2023
ab2e058
WCOSS2 RT Log
BrianCurtis-NOAA Aug 2, 2023
1e5fc5f
update DISKNM with epic and rt log
jkbk2004 Aug 2, 2023
b4e2dcd
Update bl.py for new Hera blstore
zach1221 Aug 2, 2023
8cf2233
update CICE and revert gitmodules
DeniseWorthen Aug 2, 2023
d18521e
Merge branch 'develop' into feature/updcice
DeniseWorthen Aug 23, 2023
52786d6
update CICE submodule
DeniseWorthen Aug 23, 2023
756976a
update CICE
DeniseWorthen Aug 23, 2023
b92932a
update CICE.
DeniseWorthen Aug 23, 2023
362fc80
Merge branch 'ufs-community:develop' into feature/updcice
DeniseWorthen Aug 24, 2023
328f6b9
Merge branch 'ufs-community:develop' into feature/updcice
DeniseWorthen Aug 26, 2023
4c19412
Merge branch 'ufs-community:develop' into feature/updcice
DeniseWorthen Aug 30, 2023
0c9c260
Merge branch 'ufs-community:develop' into feature/updcice
DeniseWorthen Sep 1, 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
6 changes: 4 additions & 2 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,10 @@
branch = dev/emc
[submodule "CICE"]
path = CICE-interface/CICE
url = https://github.com/NOAA-EMC/CICE
branch = emc/develop
#url = https://github.com/NOAA-EMC/CICE
#branch = emc/develop
url = https://github.com/DeniseWorthen/CICE
branch = feature/updcice
[submodule "CDEPS"]
path = CDEPS-interface/CDEPS
url = https://github.com/NOAA-EMC/CDEPS
Expand Down
2 changes: 1 addition & 1 deletion CICE-interface/CICE
Open in desktop
Submodule CICE updated 39 files
+35 −8 .github/workflows/test-cice.yml
+3 −222 cicecore/cicedyn/analysis/ice_diagnostics_bgc.F90
+2 −2 cicecore/cicedyn/analysis/ice_history.F90
+17 −113 cicecore/cicedyn/analysis/ice_history_bgc.F90
+2 −6 cicecore/cicedyn/dynamics/ice_transport_driver.F90
+0 −10 cicecore/cicedyn/general/ice_flux.F90
+0 −6 cicecore/cicedyn/general/ice_flux_bgc.F90
+1 −1 cicecore/cicedyn/general/ice_init.F90
+15 −23 cicecore/cicedyn/general/ice_step_mod.F90
+1 −0 cicecore/cicedyn/infrastructure/ice_read_write.F90
+5 −15 cicecore/cicedyn/infrastructure/io/io_binary/ice_restart.F90
+2 −13 cicecore/cicedyn/infrastructure/io/io_netcdf/ice_restart.F90
+2 −12 cicecore/cicedyn/infrastructure/io/io_pio2/ice_restart.F90
+4 −7 cicecore/drivers/nuopc/cmeps/CICE_InitMod.F90
+23 −16 cicecore/drivers/nuopc/cmeps/CICE_RunMod.F90
+76 −8 cicecore/drivers/nuopc/cmeps/cice_wrapper_mod.F90
+24 −3 cicecore/drivers/nuopc/cmeps/ice_comp_nuopc.F90
+4 −6 cicecore/drivers/standalone/cice/CICE_InitMod.F90
+7 −12 cicecore/drivers/standalone/cice/CICE_RunMod.F90
+59 −16 cicecore/drivers/unittest/gridavgchk/CICE_InitMod.F90
+59 −16 cicecore/drivers/unittest/halochk/CICE_InitMod.F90
+4 −6 cicecore/drivers/unittest/opticep/CICE_InitMod.F90
+7 −12 cicecore/drivers/unittest/opticep/CICE_RunMod.F90
+21 −123 cicecore/drivers/unittest/opticep/ice_init_column.F90
+12 −20 cicecore/drivers/unittest/opticep/ice_step_mod.F90
+59 −17 cicecore/drivers/unittest/sumchk/CICE_InitMod.F90
+17 −58 cicecore/shared/ice_arrays_column.F90
+19 −119 cicecore/shared/ice_init_column.F90
+8 −86 cicecore/shared/ice_restart_column.F90
+4 −2 configuration/scripts/cice.batch.csh
+2 −2 configuration/scripts/cice.launch.csh
+0 −56 configuration/scripts/machines/Macros.badger_intel
+58 −0 configuration/scripts/machines/Macros.chicoma_intel
+6 −4 configuration/scripts/machines/Macros.conda_macos
+0 −47 configuration/scripts/machines/env.badger_intel
+71 −0 configuration/scripts/machines/env.chicoma_intel
+0 −8 configuration/scripts/options/set_nml.zsal
+2 −2 doc/source/user_guide/ug_case_settings.rst
+1 −1 icepack
1 change: 0 additions & 1 deletion CICE-interface/cice_files.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,6 @@ list(APPEND icepack_files
CICE/icepack/columnphysics/icepack_wavefracspec.F90
CICE/icepack/columnphysics/icepack_zbgc.F90
CICE/icepack/columnphysics/icepack_zbgc_shared.F90
CICE/icepack/columnphysics/icepack_zsalinity.F90
)

list(APPEND cice_shared_files_c
Expand Down