Skip to content

Commit b149a84

Browse files
authored
Merge pull request #121 from ACCESS-NRI/dev-preindustrial+concentrations
Changes for ESM1.5 pre-industrial minor release 1.2
2 parents 07c2929 + 75e39b9 commit b149a84

13 files changed

+1756
-81
lines changed

atmosphere/diagnostic_profiles/STASHC_spinup_concentrations

+714
Large diffs are not rendered by default.

atmosphere/um_env.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ RPSEED: ''
1010
RUNID: PI-01
1111
TYPE: NRUN
1212
UM_ATM_NPROCX: '16'
13-
UM_ATM_NPROCY: '12'
13+
UM_ATM_NPROCY: '15'
1414
UM_NAM_MAX_SECONDS: '300'
15-
UM_NPES: '192'
15+
UM_NPES: '240'
1616
UM_SECTOR_SIZE: '2048'
1717
UM_STDOUT_FILE: atm.fort6.pe
1818
VN: '7.3'

config.yaml

+6-4
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,15 @@ modules:
2626
use:
2727
- /g/data/vk83/modules
2828
load:
29-
- access-esm1p5/2024.05.1
29+
- access-esm1p5/2024.12.0
3030

3131
# Model configuration
3232
model: access
3333

3434
submodels:
3535
- name: atmosphere
3636
model: um
37-
ncpus: 192
37+
ncpus: 240
3838
exe: um_hg3.exe
3939
input:
4040
# Aerosols
@@ -63,7 +63,7 @@ submodels:
6363
- /g/data/vk83/configurations/inputs/access-esm1p5/modern/share/atmosphere/grids/global.N96/2020.05.19/qrparm.mask
6464
- /g/data/vk83/configurations/inputs/access-esm1p5/share/atmosphere/grids/resolution_independent/2020.05.19/vertlevs_G3
6565
# STASH
66-
- /g/data/vk83/configurations/inputs/access-esm1p5/share/atmosphere/stash/2020.05.19/
66+
- /g/data/vk83/configurations/inputs/access-esm1p5/share/atmosphere/stash/2024.11.01
6767

6868
- name: ocean
6969
model: mom
@@ -81,6 +81,8 @@ submodels:
8181
- /g/data/vk83/configurations/inputs/access-esm1p5/modern/share/ocean/shortwave_penetration/global.1deg/2020.05.19/ssw_atten_depth.nc
8282
# Grids
8383
- /g/data/vk83/configurations/inputs/access-esm1p5/modern/share/ocean/grids/mosaic/global.1deg/2020.05.19/grid_spec.nc
84+
# Basin mask
85+
- /g/data/vk83/configurations/inputs/access-esm1p5/modern/share/ocean/basins/global.1deg/2020.05.19/basin_mask.nc
8486

8587
- name: ice
8688
model: cice
@@ -142,7 +144,7 @@ manifest:
142144
reproduce:
143145
exe: True
144146

145-
147+
payu_minimum_version: 1.1.6
146148
stacksize: unlimited
147149
qsub_flags: -W umask=027
148150

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,126 @@
1+
&setup_nml
2+
, histfreq = 'd','m','x','x','x'
3+
, histfreq_n = 1, 1, 1, 1, 1
4+
, hist_avg = .true.
5+
/
6+
7+
! Please note, the following diagnostics are affected by
8+
! issues in ACCESS ESM1.5 and have been disabled from the output:
9+
! fsalt_ai, daidtd, daidtt, dvidtd, congel, frazil, meltl, meltb,
10+
! meltt, snoice, dvidtt, fswthru_ai, Tsfc.
11+
12+
&icefields_nml
13+
f_tmask = .true.
14+
, f_tarea = .true.
15+
, f_uarea = .true.
16+
, f_dxt = .false.
17+
, f_dyt = .false.
18+
, f_dxu = .false.
19+
, f_dyu = .false.
20+
, f_HTN = .false.
21+
, f_HTE = .false.
22+
, f_ANGLE = .true.
23+
, f_ANGLET = .true.
24+
, f_NCAT = .true.
25+
, f_VGRDi = .true.
26+
, f_VGRDs = .true.
27+
, f_bounds = .false.
28+
, f_hi = 'm'
29+
, f_hs = 'x'
30+
, f_Tsfc = 'x'
31+
, f_aice = 'm'
32+
, f_uvel = 'm'
33+
, f_vvel = 'm'
34+
, f_fswdn = 'x'
35+
, f_flwdn = 'x'
36+
, f_snow = 'x'
37+
, f_snow_ai = 'x'
38+
, f_rain = 'x'
39+
, f_rain_ai = 'x'
40+
, f_sst = 'x'
41+
, f_sss = 'x'
42+
, f_uocn = 'x'
43+
, f_vocn = 'x'
44+
, f_frzmlt = 'x'
45+
, f_fswfac = 'x'
46+
, f_fswabs = 'x'
47+
, f_fswabs_ai = 'x'
48+
, f_albsni = 'x'
49+
, f_alvdr = 'x'
50+
, f_alidr = 'x'
51+
, f_albice = 'x'
52+
, f_albsno = 'x'
53+
, f_albpnd = 'x'
54+
, f_coszen = 'x'
55+
, f_flat = 'x'
56+
, f_flat_ai = 'x'
57+
, f_fsens = 'x'
58+
, f_fsens_ai = 'x'
59+
, f_flwup = 'x'
60+
, f_flwup_ai = 'x'
61+
, f_evap = 'x'
62+
, f_evap_ai = 'x'
63+
, f_Tair = 'x'
64+
, f_Tref = 'x'
65+
, f_Qref = 'x'
66+
, f_congel = 'x'
67+
, f_frazil = 'x'
68+
, f_snoice = 'x'
69+
, f_meltt = 'x'
70+
, f_meltb = 'x'
71+
, f_meltl = 'x'
72+
, f_fresh = 'x'
73+
, f_fresh_ai = 'x'
74+
, f_fsalt = 'x'
75+
, f_fsalt_ai = 'x'
76+
, f_fhocn = 'x'
77+
, f_fhocn_ai = 'x'
78+
, f_fswthru = 'x'
79+
, f_fswthru_ai = 'x'
80+
, f_fsurf_ai = 'x'
81+
, f_fcondtop_ai = 'x'
82+
, f_fmeltt_ai = 'x'
83+
, f_strairx = 'x'
84+
, f_strairy = 'x'
85+
, f_strtltx = 'x'
86+
, f_strtlty = 'x'
87+
, f_strcorx = 'x'
88+
, f_strcory = 'x'
89+
, f_strocnx = 'x'
90+
, f_strocny = 'x'
91+
, f_strintx = 'x'
92+
, f_strinty = 'x'
93+
, f_strength = 'x'
94+
, f_divu = 'x'
95+
, f_shear = 'x'
96+
, f_sig1 = 'x'
97+
, f_sig2 = 'x'
98+
, f_dvidtt = 'x'
99+
, f_dvidtd = 'x'
100+
, f_daidtt = 'x'
101+
, f_daidtd = 'x'
102+
, f_mlt_onset = 'x'
103+
, f_frz_onset = 'x'
104+
, f_dardg1dt = 'x'
105+
, f_dardg2dt = 'x'
106+
, f_dvirdgdt = 'x'
107+
, f_opening = 'x'
108+
, f_hisnap = 'x'
109+
, f_aisnap = 'x'
110+
, f_trsig = 'x'
111+
, f_icepresent = 'x'
112+
, f_iage = 'x'
113+
, f_alvl = 'x'
114+
, f_vlvl = 'x'
115+
, f_ardg = 'x'
116+
, f_vrdg = 'x'
117+
, f_aicen = 'x'
118+
, f_vicen = 'x'
119+
, f_Tinz = 'x'
120+
, f_Tsnz = 'x'
121+
, f_fsurfn_ai = 'x'
122+
, f_fcondtopn_ai = 'x'
123+
, f_fmelttn_ai = 'x'
124+
, f_flatn_ai = 'x'
125+
, f_apondn = 'x'
126+
/

manifests/exe.yaml

+9-9
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@ format: yamanifest
22
version: 1.0
33
---
44
work/atmosphere/um_hg3.exe:
5-
fullpath: /g/data/vk83/apps/spack/0.22/restricted/ukmo/release/linux-rocky8-x86_64_v4/intel-19.0.3.199/um7-git.2024.07.03_access-esm1.5-kgxooyp2s476dd4zc5mgtwhxfknkhnoe/bin/um_hg3.exe
5+
fullpath: /g/data/vk83/apps/spack/0.22/restricted/ukmo/release/linux-rocky8-x86_64_v4/intel-19.0.3.199/um7-git.2024.10.17_access-esm1.5-l3w5m5ub4qkaai4rqsrixyeggwvenqeg/bin/um_hg3.exe
66
hashes:
7-
binhash: 3180dda616c7dfe63d8134e00bff2641
8-
md5: 1b7874ffb5e34ec50b6a68abbb7769a6
7+
binhash: 7d84592b11262545ecbe8a9d10f69055
8+
md5: 93c8bca8d07dd29b94e0a62ffc31c4f6
99
work/ice/cice_access_360x300_12x1_12p.exe:
10-
fullpath: /g/data/vk83/apps/spack/0.22/restricted/ukmo/release/linux-rocky8-x86_64_v4/intel-19.0.3.199/cice4-git.2024.05.21_access-esm1.5-hhtnigwxdyz7ta4dv3gvhwulze6hxqra/bin/cice_access_360x300_12x1_12p.exe
10+
fullpath: /g/data/vk83/apps/spack/0.22/restricted/ukmo/release/linux-rocky8-x86_64_v4/intel-19.0.3.199/cice4-git.2024.05.21_access-esm1.5-izhg4i36v6nzwulk5doeb2b4tv7dvjpg/bin/cice_access_360x300_12x1_12p.exe
1111
hashes:
12-
binhash: 818f213e53d30fc307b565c35939382c
13-
md5: 04fd88249ebc16e3f560fc265838e9d1
12+
binhash: 4e0b0196ffa6cd59c554682ca6cd60bb
13+
md5: 0bf593b74adb9060885fc875fa5fe23b
1414
work/ocean/fms_ACCESS-CM.x:
15-
fullpath: /g/data/vk83/apps/spack/0.22/restricted/ukmo/release/linux-rocky8-x86_64_v4/intel-19.0.3.199/mom5-git.access-esm1.5_2024.08.23_access-esm1.5-ougudnkjcdkuuu6wuxne3uy7tr4y6oes/bin/fms_ACCESS-CM.x
15+
fullpath: /g/data/vk83/apps/spack/0.22/restricted/ukmo/release/linux-rocky8-x86_64_v4/intel-19.0.3.199/mom5-git.access-esm1.5_2024.08.23_access-esm1.5-m5h4mmwug6umrm7iqqvctnvsy4hwp2wv/bin/fms_ACCESS-CM.x
1616
hashes:
17-
binhash: 711dd9e382eee06aba1f38ce83f7e7d5
18-
md5: 96863931103def85ed76b152ba01b5c1
17+
binhash: 794da19ceaf34a3babb2b24d96b9b018
18+
md5: 86fd7c5105c40f8524cee935718a2138

0 commit comments

Comments
 (0)