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

Update CICE6 to allow WW3-CICE6 coupling; add a cdeps test using C-grid for sea ice dynamics (was #1390) #1381

Merged
merged 21 commits into from
Aug 30, 2022
Merged

Update CICE6 to allow WW3-CICE6 coupling; add a cdeps test using C-grid for sea ice dynamics (was #1390) #1381

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
94eb73f
update ice_in and submodules
DeniseWorthen Aug 11, 2022
9f778fe
Merge branch 'ufs-community:develop' into feature/updcice
DeniseWorthen Aug 12, 2022
3c9d720
Merge branch 'ufs-community:develop' into feature/updcice
DeniseWorthen Aug 15, 2022
753acad
Merge branch 'ufs-community:develop' into feature/updcice
DeniseWorthen Aug 20, 2022
04f3e5c
update CICE
DeniseWorthen Aug 20, 2022
83219c0
Merge branch 'ufs-community:develop' into feature/updcice
DeniseWorthen Aug 23, 2022
75b038b
update CICE
DeniseWorthen Aug 23, 2022
17f1605
tested on hera.intel, gnu
DeniseWorthen Aug 24, 2022
d3ebd72
Merge branch 'ufs-community:develop' into feature/updcice
DeniseWorthen Aug 24, 2022
83edc46
fix hafs-wav configurations
DeniseWorthen Aug 28, 2022
ec289bb
add a cdeps test using c-grid for CICE6 (#27)
binli2337 Aug 29, 2022
8556e5c
update baseline date
DeniseWorthen Aug 29, 2022
0d8853e
wcoss2.intel RT passed
BrianCurtis-NOAA Aug 29, 2022
2d8e456
[AutoRT] orion.intel Job Completed.
BrianCurtis-NOAA Aug 29, 2022
b9e0f92
[AutoRT] hera.gnu Job Completed.
BrianCurtis-NOAA Aug 29, 2022
88b30f0
[AutoRT] hera.intel Job Completed.
BrianCurtis-NOAA Aug 29, 2022
17cffd1
Acorn.intel RT passed
BrianCurtis-NOAA Aug 30, 2022
3efabd3
[AutoRT] gaea.intel Job Completed.
BrianCurtis-NOAA Aug 30, 2022
b5d81d7
add cheyenne intel/gnu RT logs: passed
jkbk2004 Aug 30, 2022
acb8c9b
add jet.intel RT log: passed
jkbk2004 Aug 30, 2022
50e3942
update CICE and revert gitmodules
DeniseWorthen Aug 30, 2022
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
Next Next commit
update ice_in and submodules 
* cesm_ponds is deprecated so remove from ice_in
  • Loading branch information
@DeniseWorthen
DeniseWorthen committed Aug 11, 2022
commit 94eb73f69e54ffcd099dd1f69a79f8782f0c2b9d
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/wave_ice
[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 65 files
+24 −27 cice.setup
+18 −18 cicecore/cicedynB/analysis/ice_diagnostics.F90
+25 −25 cicecore/cicedynB/analysis/ice_history.F90
+14 −1 cicecore/cicedynB/analysis/ice_history_pond.F90
+40 −40 cicecore/cicedynB/dynamics/ice_dyn_eap.F90
+60 −59 cicecore/cicedynB/dynamics/ice_dyn_evp.F90
+246 −246 cicecore/cicedynB/dynamics/ice_dyn_shared.F90
+94 −94 cicecore/cicedynB/dynamics/ice_dyn_vp.F90
+15 −0 cicecore/cicedynB/dynamics/ice_transport_driver.F90
+35 −50 cicecore/cicedynB/general/ice_flux.F90
+92 −58 cicecore/cicedynB/general/ice_init.F90
+6 −5 cicecore/cicedynB/general/ice_state.F90
+8 −0 cicecore/cicedynB/general/ice_step_mod.F90
+9 −2 cicecore/cicedynB/infrastructure/ice_grid.F90
+7 −6 cicecore/cicedynB/infrastructure/ice_restart_driver.F90
+30 −0 cicecore/cicedynB/infrastructure/io/io_binary/ice_restart.F90
+10 −0 cicecore/cicedynB/infrastructure/io/io_netcdf/ice_restart.F90
+10 −0 cicecore/cicedynB/infrastructure/io/io_pio2/ice_restart.F90
+16 −0 cicecore/drivers/direct/hadgem3/CICE_InitMod.F90
+14 −0 cicecore/drivers/direct/hadgem3/CICE_RunMod.F90
+16 −0 cicecore/drivers/direct/nemo_concepts/CICE_InitMod.F90
+14 −0 cicecore/drivers/direct/nemo_concepts/CICE_RunMod.F90
+16 −0 cicecore/drivers/mct/cesm1/CICE_InitMod.F90
+14 −0 cicecore/drivers/mct/cesm1/CICE_RunMod.F90
+24 −1 cicecore/drivers/nuopc/cmeps/CICE_InitMod.F90
+14 −0 cicecore/drivers/nuopc/cmeps/CICE_RunMod.F90
+11 −11 cicecore/drivers/nuopc/cmeps/ice_comp_nuopc.F90
+83 −9 cicecore/drivers/nuopc/cmeps/ice_import_export.F90
+16 −0 cicecore/drivers/nuopc/dmi/CICE_InitMod.F90
+14 −0 cicecore/drivers/nuopc/dmi/CICE_RunMod.F90
+16 −0 cicecore/drivers/standalone/cice/CICE_InitMod.F90
+14 −0 cicecore/drivers/standalone/cice/CICE_RunMod.F90
+16 −0 cicecore/drivers/unittest/gridavgchk/CICE_InitMod.F90
+246 −0 cicecore/drivers/unittest/optargs/optargs.F90
+148 −0 cicecore/drivers/unittest/optargs/optargs_subs.F90
+16 −0 cicecore/drivers/unittest/sumchk/CICE_InitMod.F90
+15 −2 cicecore/shared/ice_init_column.F90
+6 −1 cicecore/shared/ice_restart_column.F90
+1 −1 cicecore/version.txt
+6 −2 configuration/scripts/Makefile
+1 −3 configuration/scripts/ice_in
+2 −2 configuration/scripts/machines/env.badger_intel
+1 −1 configuration/scripts/machines/environment.yml
+2 −0 configuration/scripts/options/set_env.optargs
+1 −2 configuration/scripts/options/set_nml.alt01
+0 −1 configuration/scripts/options/set_nml.alt02
+0 −1 configuration/scripts/options/set_nml.alt03
+0 −1 configuration/scripts/options/set_nml.alt04
+0 −1 configuration/scripts/options/set_nml.alt05
+1 −1 configuration/scripts/options/set_nml.alt07
+1 −2 configuration/scripts/options/set_nml.boxadv
+1 −2 configuration/scripts/options/set_nml.boxnodyn
+1 −2 configuration/scripts/options/set_nml.boxrestore
+3 −0 configuration/scripts/options/set_nml.gridcd
+1 −0 configuration/scripts/options/set_nml.qc
+215 −88 configuration/scripts/tests/QC/cice.t-test.py
+7 −7 configuration/scripts/tests/omp_suite.ts
+1 −0 configuration/scripts/tests/unittest_suite.ts
+5 −0 configuration/tools/cice4_restart_conversion/convert_restarts.f90
+15 −9 doc/source/cice_index.rst
+2 −2 doc/source/conf.py
+3 −3 doc/source/science_guide/sg_tracers.rst
+10 −4 doc/source/user_guide/ug_case_settings.rst
+3 −3 doc/source/user_guide/ug_testing.rst
+1 −1 icepack
2 changes: 0 additions & 2 deletions tests/parm/ice_in_template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,6 @@
restart_FY = .false.
tr_lvl = .true.
restart_lvl = .false.
tr_pond_cesm = .false.
restart_pond_cesm = .false.
tr_pond_topo = .false.
restart_pond_topo = .false.
tr_pond_lvl = .true.
Expand Down