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

add Cgrid-related fixes for nuopc/cmeps #728

Merged
merged 127 commits into from
Jun 23, 2022
Merged

add Cgrid-related fixes for nuopc/cmeps #728

Changes from 1 commit
Commits
Show all changes
127 commits
Select commit Hold shift + click to select a range
0338d04
Merge pull request #1 from CICE-Consortium/master
DeniseWorthen Feb 25, 2020
99470ed
Merge pull request #2 from CICE-Consortium/master
DeniseWorthen Mar 7, 2020
71d2ded
Merge pull request #3 from CICE-Consortium/master
DeniseWorthen Apr 2, 2020
d46d691
merge latest master (#4)
DeniseWorthen Apr 22, 2020
183218a
updated orbital calculations needed for cesm
Apr 23, 2020
10e7c20
fixed problems in updated orbital calculations needed for cesm
Apr 29, 2020
ce8e5a9
update CICE6 to support coupling with UFS
apcraig May 10, 2020
8f0b5ee
Merge pull request #2 from apcraig/ufs01
dabail10 May 10, 2020
7ac0e3d
Merge pull request #1 from ESCOMP/nuopc
DeniseWorthen May 12, 2020
80c9e6e
Merge branch 'master' of https://github.com/CICE-Consortium/CICE into…
dabail10 May 19, 2020
53715ea
put in changes so that both ufsatm and cesm requirements for potentia…
May 25, 2020
7e43703
Merge pull request #3 from mvertens/mvertens/nuopc
dabail10 May 26, 2020
397e588
Merge remote-tracking branch 'upstream/master'
DeniseWorthen Jun 2, 2020
3bb3694
Convergence on ustar for CICE. (#452) (#5)
DeniseWorthen Jun 5, 2020
f41f1e9
Merge remote-tracking branch 'upstream/nuopc' into HEAD
DeniseWorthen Jun 22, 2020
e70d1ab
update icepack submodule
DeniseWorthen Jun 22, 2020
308a1d4
Revert "update icepack submodule"
DeniseWorthen Jun 22, 2020
7848fdf
Merge branch 'master' of https://github.com/CICE-Consortium/CICE into…
dabail10 Jun 24, 2020
6982ee4
Merge remote-tracking branch 'upstream/nuopc' into HEAD
DeniseWorthen Jun 25, 2020
089f60f
update comp_ice.backend with temporary ice_timers fix
DeniseWorthen Jun 25, 2020
6affdcf
Merge branch 'master' of https://github.com/CICE-Consortium/CICE into…
dabail10 Jun 29, 2020
b5a6058
Merge branch 'master' of https://github.com/CICE-Consortium/CICE into…
dabail10 Jul 1, 2020
415df0e
Merge branch 'nuopc' of https://github.com/ESCOMP/CICE into nuopc
dabail10 Jul 1, 2020
b4da8a6
Merge branch 'master' of https://github.com/CICE-Consortium/CICE into…
dabail10 Jul 1, 2020
239c7de
Merge branch 'nuopc' of https://github.com/ESCOMP/CICE into nuopc
dabail10 Jul 1, 2020
ad03424
Fix threading problem in init_bgc
dabail10 Jul 1, 2020
73e7774
Fix additional OMP problems
dabail10 Jul 1, 2020
46fcfba
changes for coldstart running
DeniseWorthen Jul 2, 2020
c762336
Move the forapps directory
dabail10 Jul 2, 2020
6bccf71
remove cesmcoupled ifdefs
DeniseWorthen Jul 2, 2020
902e883
Fix logging issues for NUOPC
dabail10 Jul 2, 2020
178693a
Merge branch 'nuopc' of https://github.com/ESCOMP/CICE into nuopc
dabail10 Jul 2, 2020
b4afd2e
removal of many cpp-ifdefs
Jul 4, 2020
3a1b88b
fix compile errors
DeniseWorthen Jul 4, 2020
41855fd
fixes to get cesm working
Jul 4, 2020
aea1aa8
update to latest nuopc changes
Jul 4, 2020
e4c989c
Merge branch 'master' of https://github.com/CICE-Consortium/CICE into…
dabail10 Jul 6, 2020
30a81cc
fixed white space issue
Jul 7, 2020
8ebdda9
Merge pull request #4 from mvertens/nuopc
dabail10 Jul 7, 2020
27dd3b7
Add restart_coszen namelist option
dabail10 Jul 7, 2020
50bf856
Merge remote-tracking branch 'upstream/master'
DeniseWorthen Jul 7, 2020
6b4a277
Merge branch 'nuopc' into coszen
dabail10 Jul 7, 2020
93f0e86
Merge pull request #5 from ESCOMP/coszen
dabail10 Jul 7, 2020
f92bef3
update icepack submodule
DeniseWorthen Jul 7, 2020
4e8cc79
Merge remote-tracking branch 'upstream/nuopc' into emc/develop
DeniseWorthen Jul 7, 2020
8ff4ee0
change Orion to orion in backend
DeniseWorthen Jul 7, 2020
916c6af
add -link_mpi=dbg to debug flags (#8)
DeniseWorthen Jul 14, 2020
9bdb9ad
Merge remote-tracking branch 'CICE-Consortium/master' into emc/develop
DeniseWorthen Jul 15, 2020
8f37bfc
cice6 compile (#6)
MinsukJi-NOAA Jul 17, 2020
86b8dab
Merge remote-tracking branch 'upstream/emc/develop' into HEAD
DeniseWorthen Jul 17, 2020
c084de4
Merge remote-tracking branch 'upstream/master' into emc/develop
DeniseWorthen Jul 17, 2020
88cc2fd
Merge remote-tracking branch 'upstream/master' into emc/develop
DeniseWorthen Aug 5, 2020
bdf1a1f
changes for consistency w/ current emc-cice5 (#13)
DeniseWorthen Aug 12, 2020
5ecde75
Merge remote-tracking branch 'upstream/emc/develop' into emc/develop
DeniseWorthen Aug 12, 2020
d81a834
Fixcommit (#14)
DeniseWorthen Aug 13, 2020
4d7ba5b
Merge remote-tracking branch 'upstream/master' into emc/develop
DeniseWorthen Aug 13, 2020
5dcfca8
Merge remote-tracking branch 'upstream/emc/develop' into emc/develop
DeniseWorthen Aug 13, 2020
285985c
Update CICE6 for integration to S2S
DeniseWorthen Aug 31, 2020
6d30789
Merge remote-tracking branch 'upstream/emc/develop' into emc/develop
DeniseWorthen Aug 31, 2020
8129aab
Merge remote-tracking branch 'consortium/master' into emc/develop
DeniseWorthen Aug 31, 2020
ac617cd
Support TACC stampede (#19)
MinsukJi-NOAA Oct 8, 2020
23cdee7
Merge remote-tracking branch 'upstream/emc/develop' into emc/develop
DeniseWorthen Oct 8, 2020
1e4f42b
update icepack
DeniseWorthen Oct 30, 2020
2515f77
Merge remote-tracking branch 'consortium/master' into feature/updcice
DeniseWorthen Oct 30, 2020
41afe74
add ice_dyn_vp module to CICE_InitMod
DeniseWorthen Oct 30, 2020
2a0f332
update gitmodules, update icepack
DeniseWorthen Nov 10, 2020
f773ef3
Update CICE to consortium master (#23)
DeniseWorthen Nov 10, 2020
840e931
Merge remote-tracking branch 'upstream/emc/develop' into emc/develop
DeniseWorthen Nov 10, 2020
1e4d393
Merge remote-tracking branch 'upstream/emc/develop' into feature/updcice
DeniseWorthen Mar 14, 2021
66546ae
Merge remote-tracking branch 'Consortium/master' into feature/updcice
DeniseWorthen Mar 14, 2021
2eca569
update icepack
DeniseWorthen Apr 5, 2021
b52e91c
Merge remote-tracking branch 'upstream/emc/develop' into emc/develop
DeniseWorthen Apr 5, 2021
51db2f9
Merge remote-tracking branch 'Consortium/master' into feature/updcice
DeniseWorthen Jun 1, 2021
d8fb6d9
switch icepack branches
DeniseWorthen Jun 2, 2021
9a76541
update icepack
DeniseWorthen Jun 4, 2021
519d339
Update CICE to latest Consortium master (#26)
DeniseWorthen Jun 4, 2021
74e7b58
Merge remote-tracking branch 'upstream/emc/develop' into emc/develop
DeniseWorthen Jun 5, 2021
9d88d92
add cice changes for zlvs (#29)
DeniseWorthen Jun 10, 2021
d1f2d15
Merge remote-tracking branch 'upstream/emc/develop' into emc/develop
DeniseWorthen Jun 11, 2021
0c39047
Merge branch 'emc/develop' into feature/updcice
DeniseWorthen Jun 24, 2021
f3b2652
update icepack and pointer
DeniseWorthen Jun 24, 2021
9057817
Merge remote-tracking branch 'Consortium/master' into feature/updcice
DeniseWorthen Jun 24, 2021
1721728
Merge remote-tracking branch 'Consortium/master' into feature/updcice
DeniseWorthen Jul 2, 2021
55586f7
update icepack and revert gitmodules
DeniseWorthen Jul 20, 2021
441f693
Fix history features
apcraig Aug 10, 2021
15763d8
revert set_nml.histall
apcraig Aug 10, 2021
b3364a6
fix implementation error
apcraig Aug 11, 2021
96d5851
update model log output in ice_init
apcraig Aug 11, 2021
7b5c2b4
Fix QC issues
apcraig Aug 12, 2021
c5794b4
Update testing
apcraig Aug 13, 2021
eaa3c3a
update documentation
apcraig Aug 13, 2021
e31ce7e
reset calchk to 100000 years
apcraig Aug 13, 2021
83068c7
update evp1d test
apcraig Aug 13, 2021
3fd897e
Merge branch 'master' of https://github.com/cice-consortium/cice into…
apcraig Aug 13, 2021
4373d3d
update icepack
DeniseWorthen Aug 15, 2021
71f4fe6
Merge remote-tracking branch 'TCraig/tmB' into feature/updcice
DeniseWorthen Aug 15, 2021
aeb473a
Merge remote-tracking branch 'Consortium/master' into feature/updcice
DeniseWorthen Aug 20, 2021
aade124
update icepack
DeniseWorthen Aug 20, 2021
7f089d0
add memory profiling (#36)
DeniseWorthen Aug 23, 2021
397b4bd
Merge branch 'NOAA-EMC:emc/develop' into feature/updcice
DeniseWorthen Aug 26, 2021
a1b3375
update icepack
DeniseWorthen Aug 31, 2021
7d2139c
Merge remote-tracking branch 'Consortium/master' into feature/updcice
DeniseWorthen Aug 31, 2021
cd021b5
Merge remote-tracking branch 'Consortium/master' into feature/updcice
DeniseWorthen Sep 1, 2021
5cb78cd
fix rhoa when lowest_temp is 0.0
DeniseWorthen Sep 15, 2021
d0a45a2
update icepack submodule
DeniseWorthen Sep 16, 2021
2540695
Update CICE for latest Consortium master (#38)
DeniseWorthen Sep 16, 2021
8a88024
Merge branch 'NOAA-EMC:emc/develop' into feature/updcice
DeniseWorthen Sep 20, 2021
d95bd51
Use CICE-Consortium/Icepack master (#40)
DeniseWorthen Oct 1, 2021
d83c67b
Merge branch 'NOAA-EMC:emc/develop' into feature/updcice
DeniseWorthen Oct 12, 2021
8d4a3c6
recreate cap update branch (#42)
DeniseWorthen Nov 22, 2021
55bf9f4
Merge remote-tracking branch 'Consortium/main' into feature/updcice
DeniseWorthen Nov 29, 2021
7a0b65e
Merge branch 'emc/develop' into feature/updcice
DeniseWorthen Nov 30, 2021
abbebab
remove 2 extraneous lines
DeniseWorthen Nov 30, 2021
8ff0fb2
duplicate gitmodule style for icepack
DeniseWorthen Nov 30, 2021
27dfd1b
Update CICE to latest Consortium/main (#45)
DeniseWorthen Feb 24, 2022
c660075
Update CICE to Consortium/main (#48)
DeniseWorthen May 10, 2022
4b28dfe
Merge remote-tracking branch 'Consortium/main' into feature/addCgrid
DeniseWorthen May 14, 2022
247dc1d
fix comment, fix env for orion and hera
DeniseWorthen May 14, 2022
dd158e2
replace save_init with step_prep in CICE_RunMod
DeniseWorthen May 14, 2022
ae50efe
fixes for cgrid repro
DeniseWorthen May 22, 2022
cbc6046
remove added haloupdates
DeniseWorthen May 24, 2022
ab95d2d
Merge remote-tracking branch 'Consortium/main' into feature/addCgridf…
DeniseWorthen Jun 2, 2022
a38df37
Merge remote-tracking branch 'Consortium/main' into feature/addCgridf…
DeniseWorthen Jun 13, 2022
2d5487a
change F->S for ocean velocities and tilts
DeniseWorthen Jun 13, 2022
26498db
fix debug failure when grid_ice=C
DeniseWorthen Jun 20, 2022
9e2dd69
respond to review comments
DeniseWorthen Jun 22, 2022
cc0f89c
remove inserted whitespace for uvelE,N and vvelE,N
DeniseWorthen Jun 22, 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
Prev Previous commit
Next Next commit
Revert "update icepack submodule" 
This reverts commit e70d1ab.
  • Loading branch information
@DeniseWorthen
DeniseWorthen committed Jun 22, 2020
commit 308a1d4f6a1d2e8d9b78f51599eef77a2662feea
2 changes: 1 addition & 1 deletion icepack
Open in desktop
Submodule icepack updated 71 files
+1 −4 .travis.yml
+0 −1 README.md
+0 −6 codecov.yml
+14 −13 columnphysics/icepack_atmo.F90
+3 −3 columnphysics/icepack_itd.F90
+14 −10 columnphysics/icepack_mechred.F90
+5 −25 columnphysics/icepack_parameters.F90
+24 −19 columnphysics/icepack_therm_itd.F90
+8 −5 columnphysics/icepack_zbgc.F90
+1 −1 columnphysics/version.txt
+8 −19 configuration/driver/icedrv_init.F90
+4 −6 configuration/scripts/icepack.batch.csh
+24 −1 configuration/scripts/icepack.build
+0 −2 configuration/scripts/icepack.run.setup.csh
+0 −2 configuration/scripts/icepack.settings
+0 −7 configuration/scripts/icepack.test.setup.csh
+0 −3 configuration/scripts/icepack_in
+7 −0 configuration/scripts/machines/Macros.badger_intel
+0 −59 configuration/scripts/machines/Macros.cheyenne_gnu
+7 −0 configuration/scripts/machines/Macros.cheyenne_intel
+0 −48 configuration/scripts/machines/Macros.cheyenne_pgi
+7 −0 configuration/scripts/machines/Macros.conrad_cray
+11 −16 configuration/scripts/machines/Macros.conrad_gnu
+7 −0 configuration/scripts/machines/Macros.conrad_intel
+7 −0 configuration/scripts/machines/Macros.conrad_pgi
+7 −0 configuration/scripts/machines/Macros.cori_intel
+11 −16 configuration/scripts/machines/Macros.gaffney_gnu
+7 −0 configuration/scripts/machines/Macros.gaffney_intel
+7 −0 configuration/scripts/machines/Macros.gaffney_pgi
+7 −0 configuration/scripts/machines/Macros.gordon_cray
+11 −16 configuration/scripts/machines/Macros.gordon_gnu
+7 −0 configuration/scripts/machines/Macros.gordon_intel
+7 −0 configuration/scripts/machines/Macros.gordon_pgi
+1 −1 configuration/scripts/machines/Macros.high_Sierra_gnu
+1 −1 configuration/scripts/machines/Macros.hobart_intel
+1 −1 configuration/scripts/machines/Macros.hobart_nag
+4 −16 configuration/scripts/machines/Macros.izumi_gnu
+12 −17 configuration/scripts/machines/Macros.koehr_gnu
+7 −0 configuration/scripts/machines/Macros.koehr_intel
+7 −0 configuration/scripts/machines/Macros.koehr_pgi
+7 −0 configuration/scripts/machines/Macros.onyx_cray
+11 −16 configuration/scripts/machines/Macros.onyx_gnu
+7 −0 configuration/scripts/machines/Macros.onyx_intel
+12 −0 configuration/scripts/machines/Macros.testmachine_intel
+66 −0 configuration/scripts/machines/Macros.theia
+7 −0 configuration/scripts/machines/Macros.thunder_intel
+6 −18 configuration/scripts/machines/Macros.travisCI_gnu
+0 −23 configuration/scripts/machines/env.cheyenne_gnu
+0 −23 configuration/scripts/machines/env.cheyenne_pgi
+1 −1 configuration/scripts/machines/env.izumi_gnu
+1 −1 configuration/scripts/machines/env.izumi_intel
+1 −1 configuration/scripts/machines/env.izumi_nag
+1 −1 configuration/scripts/machines/env.izumi_pgi
+49 −0 configuration/scripts/machines/env.theia
+0 −1 configuration/scripts/options/set_nml.alt03
+8 −32 configuration/scripts/tests/report_results.csh
+8 −0 configuration/scripts/tests/test_restart.script
+5 −0 configuration/scripts/tests/test_smoke.script
+2 −2 doc/source/conf.py
+0 −28 doc/source/developer_guide/dg_other.rst
+8 −22 doc/source/developer_guide/dg_scripts.rst
+0 −1 doc/source/developer_guide/index.rst
+1 −1 doc/source/icepack_index.rst
+2 −43 doc/source/master_list.bib
+1 −2 doc/source/science_guide/sg_boundary_forcing.rst
+4 −14 doc/source/user_guide/interfaces.include
+308 −384 doc/source/user_guide/ug_case_settings.rst
+2 −12 doc/source/user_guide/ug_running.rst
+1 −45 doc/source/user_guide/ug_testing.rst
+0 −3 doc/source/user_guide/ug_troubleshooting.rst
+24 −130 icepack.setup