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

Reduce memory required by MERRA2 option; fix diag_tables for P7 tests; adds C384 P7 tests to Cheyenne.intel #866

Closed
wants to merge 107 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
107 commits
Select commit Hold shift + click to select a range
7b826d4
update FV3
DeniseWorthen Mar 27, 2021
cea6fc6
update hera.intel modulefiles for testing
DeniseWorthen Mar 27, 2021
071275b
Revert "update hera.intel modulefiles for testing"
DeniseWorthen Mar 27, 2021
4db2ff2
Revert "update FV3"
DeniseWorthen Mar 27, 2021
5a8d4b6
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Mar 30, 2021
09716fe
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Mar 31, 2021
f778ec2
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Apr 5, 2021
3ae6d69
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Apr 9, 2021
f187e64
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Apr 10, 2021
94f5e67
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Apr 12, 2021
4100179
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Apr 15, 2021
42d1a64
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Apr 16, 2021
8a5575b
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Apr 19, 2021
9a06325
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Apr 20, 2021
6ba165f
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Apr 21, 2021
1602558
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Apr 22, 2021
2208dea
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Apr 26, 2021
217e3f0
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Apr 27, 2021
c553a61
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Apr 28, 2021
52625f5
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Apr 30, 2021
a248612
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Apr 30, 2021
9a80b95
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen May 3, 2021
2ad32ab
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen May 5, 2021
258dc4e
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen May 7, 2021
20210f7
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen May 10, 2021
750b914
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen May 12, 2021
4f02568
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen May 13, 2021
a3fd6ad
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen May 14, 2021
4a082c0
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen May 18, 2021
8ff5a46
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen May 21, 2021
a66de98
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen May 21, 2021
9d13add
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen May 25, 2021
41e1e70
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen May 26, 2021
a04c704
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen May 29, 2021
2c312c6
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Jun 2, 2021
ceaf7ea
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Jun 3, 2021
e32547f
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Jun 4, 2021
128a986
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Jun 8, 2021
9666be5
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Jun 9, 2021
cf494c7
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Jun 10, 2021
2e74cf4
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Jun 11, 2021
2718b15
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Jun 14, 2021
c00af41
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Jun 17, 2021
7102b14
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Jun 17, 2021
3d86e14
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Jul 1, 2021
89d6a02
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Jul 7, 2021
c69e4a2
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Jul 12, 2021
f540c3c
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Jul 14, 2021
006d9cb
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Jul 16, 2021
141df40
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Jul 16, 2021
fb985c4
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Jul 20, 2021
a6a1291
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Jul 21, 2021
5cf0645
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Jul 22, 2021
85d3a67
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Jul 23, 2021
3f07e19
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Jul 26, 2021
8c60f22
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Jul 27, 2021
d1cf180
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Jul 28, 2021
4fe664a
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Jul 30, 2021
37864a5
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Aug 2, 2021
3e84f3f
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Aug 5, 2021
3059f0d
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Aug 6, 2021
2469f43
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Aug 10, 2021
1ec3109
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Aug 12, 2021
21e9efd
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Aug 13, 2021
ea726bb
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Aug 16, 2021
b8a72e9
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Aug 18, 2021
b8226c7
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Aug 18, 2021
14c1b23
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Aug 20, 2021
8e39fd0
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Aug 23, 2021
1fcb4be
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Aug 25, 2021
63866ec
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Aug 27, 2021
5359a09
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Aug 30, 2021
ed28401
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Sep 3, 2021
6f0a7d9
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Sep 3, 2021
7ccadf0
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Sep 7, 2021
ca5fa34
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Sep 10, 2021
68907ae
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Sep 13, 2021
80992b3
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Sep 13, 2021
e3507ee
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Sep 15, 2021
d2aa73a
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Sep 20, 2021
fcb2067
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Sep 21, 2021
26680f6
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Sep 22, 2021
0dff574
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Sep 24, 2021
96c8d6b
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Sep 24, 2021
1172ca1
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Sep 27, 2021
1f5fa8a
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Sep 29, 2021
7832c73
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Sep 30, 2021
88e2814
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Oct 1, 2021
50509d9
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Oct 6, 2021
3a6a419
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Oct 7, 2021
786e151
create branch for testing aero4
DeniseWorthen Oct 9, 2021
42f7dd9
fix diag_table_templates
DeniseWorthen Oct 9, 2021
30a2409
hera.intel baselines pass
DeniseWorthen Oct 9, 2021
03df9c5
turn on tests for cheyenne.intel
DeniseWorthen Oct 9, 2021
6e08b63
fix diag_table for standalone p7 tests
DeniseWorthen Oct 10, 2021
d29a0b8
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Oct 18, 2021
b059d03
Merge branch 'develop' into feature/aero4
DeniseWorthen Oct 18, 2021
c2b7b0c
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Oct 19, 2021
990e19b
update FV3
DeniseWorthen Oct 19, 2021
ba8ca1a
Merge branch 'develop' into feature/aero4
DeniseWorthen Oct 19, 2021
674d882
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Oct 22, 2021
542ee3e
update FV3 submodule
DeniseWorthen Oct 22, 2021
96e6863
Merge branch 'develop' into feature/aero4
DeniseWorthen Oct 22, 2021
168e54e
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Oct 25, 2021
33b3de2
update FV3 submodule
DeniseWorthen Oct 25, 2021
341bbba
Merge branch 'develop' into feature/aero4
DeniseWorthen Oct 25, 2021
d2abb32
update FV3 (again)
DeniseWorthen Oct 25, 2021
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
Merge remote-tracking branch 'upstream/develop' into develop
  • Loading branch information
DeniseWorthen committed Apr 15, 2021
commit 410017968f040b8a4b2714987482836e0120ad74

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.