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

noresm2_5_015_cam6_4_041: Updates from ESCOMP/CAM #175

Merged
merged 50 commits into from
Nov 12, 2024
Merged
Changes from 1 commit
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
7fb147f
ESCOMP tag: cam6_3_159
Katetc Apr 26, 2024
bb5275d
ESCOMP tag: cam6_3_160
cacraigucar Apr 29, 2024
d9347d3
ESCOMP tag: cam6_3_161
cacraigucar May 16, 2024
7388ed9
ESCOMP tag: cam6_3_162
cacraigucar Jun 7, 2024
2c7efda
ESCOMP tag: cam6_4_001
brian-eaton Jun 26, 2024
9248c00
ESCOMP tag: cam6_4_002
brian-eaton Jun 26, 2024
5f2ff2a
ESCOMP tag: cam6_4_003
jtruesdal Jun 28, 2024
d4f9cad
ESCOMP tag: cam6_4_004
fvitt Jun 29, 2024
ff0b850
ESCOMP tag: cam6_4_005
brian-eaton Jul 1, 2024
b71ba86
ESCOMP tag: cam6_4_006
brian-eaton Jul 3, 2024
6296a20
ESCOMP tag: cam6_4_007
mwaxmonsky Jul 8, 2024
32f9fb1
ESCOMP tag: cam6_4_008
cacraigucar Jul 10, 2024
f16af07
ESCOMP tag: cam6_4_009
briandobbins Jul 11, 2024
a1cf7dc
ESCOMP tag: cam6_4_010
cacraigucar Jul 18, 2024
b4d10df
ESCOMP tag: cam6_4_011
cacraigucar Jul 19, 2024
7650946
ESCOMP tag: cam6_4_012
fvitt Jul 20, 2024
4bbda45
ESCOMP tag: cam6_4_013
fvitt Jul 21, 2024
1ef560a
ESCOMP tag: cam6_4_014
fvitt Jul 22, 2024
684a411
ESCOMP tag: cam6_4_015
brian-eaton Jul 23, 2024
b02b6cd
ESCOMP tag: cam6_4_016
brian-eaton Jul 25, 2024
d8909f3
ESCOMP tag: cam6_4_017
brian-eaton Jul 30, 2024
1f66131
ESCOMP tag: cam6_4_018
peverwhee Jul 31, 2024
2b54c49
ESCOMP tag: cam6_4_019
Katetc Aug 12, 2024
f129c14
ESCOMP tag: cam6_4_020
fvitt Aug 14, 2024
8345d33
ESCOMP tag: cam6_4_021
jtruesdal Aug 17, 2024
aca174b
ESCOMP tag: cam6_4_022
cacraigucar Aug 20, 2024
8d57af5
ESCOMP tag: cam6_4_023
jtruesdal Aug 26, 2024
731824f
ESCOMP tag: cam6_4_024
brian-eaton Aug 28, 2024
83f6c5a
ESCOMP tag: cam6_4_025
fvitt Aug 28, 2024
e754ac4
ESCOMP tag: cam6_4_026
cacraigucar Aug 29, 2024
37be340
ESCOMP tag: cam6_4_027
fvitt Sep 3, 2024
376be4e
ESCOMP tag: cam6_4_028
fvitt Sep 4, 2024
2194aca
ESCOMP tag: cam6_4_029
fvitt Sep 6, 2024
aac3a11
ESCOMP tag: cam6_4_030
cacraigucar Sep 6, 2024
8ad60d5
ESCOMP tag: cam6_4_031
nusbaume Sep 9, 2024
09c8452
ESCOMP tag: cam6_4_032
peverwhee Sep 10, 2024
faaeca3
ESCOMP tag: cam6_4_033
gdicker1 Sep 13, 2024
cac02cc
ESCOMP tag: cam6_4_034
jimmielin Sep 19, 2024
beefd55
ESCOMP tag: cam6_4_035
fvitt Sep 23, 2024
d730522
ESCOMP tag: cam6_4_036
gdicker1 Sep 24, 2024
619daf3
ESCOMP tag: cam6_4_037
jimmielin Oct 1, 2024
ff54e3b
ESCOMP tag: cam6_4_038
fvitt Oct 1, 2024
a498b62
ESCOMP tag: cam6_4_039
brian-eaton Oct 10, 2024
aa9e3ea
ESCOMP tag: cam6_4_040
nusbaume Oct 15, 2024
7ae4aab
ESCOMP tag: cam6_4_041
fvitt Oct 16, 2024
423db6d
Updates from ESCOMP/CAM
Nov 7, 2024
892b338
Update externals
Nov 11, 2024
ddfde6f
Merge remote-tracking branch 'NorESM/noresm_develop' into UpdateNores…
Nov 12, 2024
18f2652
Add MPAS as an optional dycore
Nov 12, 2024
9bc40e1
Fix typo in fleximod check entry
Nov 12, 2024
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
ESCOMP tag: cam6_3_160
Merge pull request ESCOMP#1020 from cacraigucar/cam_sct_fix

Fix for SCT when using ccs_config_ces0.0.99 on derecho

ESCOMP commit: eaa6435
cacraigucar authored and Steve Goldhaber committed Nov 8, 2024
commit bb5275d9be5d87c222d28c3c5359888a7cc9141f
10 changes: 10 additions & 0 deletions cime_config/SystemTests/sct.py
Original file line number Diff line number Diff line change
@@ -79,3 +79,13 @@ def _component_compare_test(self, suffix1, suffix2,
self._test_status.set_status("{}_{}_{}".format(COMPARE_PHASE, self._run_one_suffix, self._run_two_suffix), TEST_FAIL_STATUS)
comments="QDIFF,TDIFF: Difference greater than round off."
append_testlog(comments, self._orig_caseroot)

def _case_two_custom_prerun_action(self):
""" On NCAR derecho system the mpibind script causes ESMF in the second job to think it is using 128 tasks when it should only use 1
changing the env variable PBS_SELECT solves this issue
"""
machine = self._case2.get_value("MACH")
if "derecho" in machine:
os.environ["PBS_SELECT"] = "1:ncpus=1:mpiprocs=1:ompthreads=1:mem=230gb:Qlist=cpu:ngpus=0"


51 changes: 51 additions & 0 deletions doc/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,54 @@

===============================================================

Tag name: cam6_3_160
Originator(s): cacraig, jedwards
Date: April 29, 2024
One-line Summary: workaround so that sct works on derecho
Github PR URL: https://github.com/ESCOMP/CAM/pull/1019

Purpose of changes (include the issue number and title text for each relevant GitHub issue):
- Newest ccs_config tag causes the derecho_intel SCT test to fail: https://github.com/ESCOMP/CAM/issues/1017

IMPORTANT NOTE: This tag breaks the SCT test on derecho (see below) as it does not bring in the update to ccs_config_cesm0.0.99
The reason to do this is that this change will be available for the next CESM alpha tag starting today.
In order to not hold up the CESM alpha tag sequence, we do not have time to run the full regression test suite

Describe any changes made to build system: N/A

Describe any changes made to the namelist: N/A

List any changes to the defaults for the boundary datasets: N/A

Describe any substantial timing or memory changes: N/A

Code reviewed by: nusbaume, katec, cacraig

List all files eliminated: N/A

List all files added and what they do: N/A

List all existing files that have been modified, and describe the changes:
M cime_config/SystemTests/sct.py

TESTING NOTES: Due to time constraints, only the SCT tests were run

derecho/intel/aux_cam: Only SCT test was run:
SCT_D_Ln7.T42_T42_mg17.QPC5.derecho_intel.cam-scm_prep - Did not even start up with this change when using the
- current ccs_config tag. Error reported in cime-test.o4308193 file:
File "/glade/u/apps/derecho/23.09/opt/._view/dmewvyohndr7lajyom5grftguonqfbdr/lib/python3.10/xml/etree/ElementTree.py", line 580, in parse
self._root = parser._parse_whole(source)
xml.etree.ElementTree.ParseError: not well-formed (invalid token): line 1, column 0

SCT_D_Ln7.T42_T42_mg17.QPC5.derecho_intel.cam-scm_prep (Overall: PASS) details:
- When ccs_config_cesm0.0.99 is used, this test PASSES and is BFB


izumi/nag/aux_cam: None run

izumi/gnu/aux_cam: Only two SCT tests were run and they were BFB and ran fine

===============================================================
===============================================================

Tag name: cam6_3_159