Skip to content

Commit e05a52e

Browse files
authored
Merge pull request #117 from ACCESS-NRI/114-cmip7-volcanic
Use CMIP7 PI control volcanic AOD
2 parents d3c5611 + 03111bb commit e05a52e

2 files changed

Lines changed: 84 additions & 84 deletions

File tree

atmosphere/input_atm.nml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
xfactor=1.0
44
SC=1361.62
55
co2_init=284.725
6-
VOLCTS_val=133.8
6+
VOLCTS_val=138.0
77
ocn_sss=.false.
88
sdump_enable=.false.
99
rdump_enable=.false.

testing/checksum/historical-24hr-checksum.json

Lines changed: 83 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -102,43 +102,43 @@
102102
],
103103
"Zonal velocity": [
104104
"2917323985414331936",
105-
"-9151354405821577159"
105+
"-1685007581654666460"
106106
],
107107
"Meridional velocity": [
108108
"5382288454087887652",
109-
"-2876858136541757154"
109+
"-5654189730218882618"
110110
],
111111
"Advection of u": [
112112
"-5561368133746418789",
113-
"-6156541328965437163"
113+
"720272088765251095"
114114
],
115115
"Advection of v": [
116116
"-1852445070373664023",
117-
"5052951043029075036"
117+
"-2457636463000998757"
118118
],
119119
"rho(taup1)": [
120120
"2267737336175840575",
121-
"2273234901968135785"
121+
"2273263366503548168"
122122
],
123123
"pressure_at_depth": [
124124
"-8917610440635044556",
125-
"-9018646903665023135"
125+
"-9018428637111065294"
126126
],
127127
"denominator_r": [
128128
"7004195058352558593",
129-
"6997765637122500342"
129+
"6998051014491561424"
130130
],
131131
"drhodT": [
132132
"1554019807514262380",
133-
"3191866731545882426"
133+
"3191281300077572214"
134134
],
135135
"drhodS": [
136136
"-5354902772460364870",
137-
"-5365492590415194806"
137+
"-5365280596679700638"
138138
],
139139
"drhodz_zt": [
140140
"188228446652535825",
141-
"6837727704459760792"
141+
"-5506275144337256039"
142142
],
143143
"thickness_sigma": [
144144
"4910612443694104576",
@@ -166,64 +166,64 @@
166166
"137605690562716663"
167167
],
168168
"dicr": [
169-
"71844102073690437"
169+
"1449106648503758442"
170170
],
171171
"dicp": [
172-
"8616193081777599500"
172+
"-628299139163560592"
173173
],
174174
"caco3": [
175-
"-4614257502465519814"
175+
"-4600647636769246242"
176176
],
177177
"alk": [
178-
"-7141430158322779272"
178+
"-7142557598672741427"
179179
],
180180
"dic": [
181-
"3903983934682095"
181+
"2969942048517092"
182182
],
183183
"no3": [
184-
"-203171371931618912"
184+
"-160685350706372695"
185185
],
186186
"phy": [
187-
"6516351977060360146"
187+
"6628724019504577070"
188188
],
189189
"pchl": [
190-
"6044573275473846551"
190+
"6064083338719295079"
191191
],
192192
"o2": [
193-
"2033435291848956430"
193+
"-8256953774464822330"
194194
],
195195
"fe": [
196-
"-7800091660788322432"
196+
"-7761802446396075512"
197197
],
198198
"zoo": [
199-
"-648206303514437728"
199+
"-618646810346817202"
200200
],
201201
"det": [
202-
"3815394724450067496"
202+
"3850461944937691329"
203203
],
204204
"phyfe": [
205-
"-1489824447836661739"
205+
"-1312626140775485804"
206206
],
207207
"zoofe": [
208-
"6480255266307909969"
208+
"6488169496321439135"
209209
],
210210
"detfe": [
211-
"1087282337479517878"
211+
"1093054157020106844"
212212
],
213213
"temp": [
214-
"6462225803098581297"
214+
"6261858017318691787"
215215
],
216216
"salt": [
217-
"4447396472454091543"
217+
"4447508482453063950"
218218
],
219219
"age_global": [
220-
"2275708664324805827"
220+
"428655783727130342"
221221
],
222222
"frazil": [
223-
"2400109391202168445"
223+
"-9092772961307740433"
224224
],
225225
"pot_temp": [
226-
"-683685095208230120"
226+
"8521038273189109304"
227227
],
228228
"caco3bury": [
229229
"0"
@@ -232,76 +232,76 @@
232232
"0"
233233
],
234234
"caco3_sediment": [
235-
"-1696499013175152478"
235+
"-1696519081677118201"
236236
],
237237
"detfe_sediment": [
238-
"-2282102609619435830"
238+
"-2282111582273600113"
239239
],
240240
"det_sediment": [
241-
"-7418132608079162289"
241+
"-7418069248717031588"
242242
],
243243
"ending agm_array": [
244-
"2758985375397371274"
244+
"2888843201160826579"
245245
],
246246
"ending aredi_array": [
247247
"5393975347450478592"
248248
],
249249
"ending rossby_radius": [
250-
"8364536302853393573"
250+
"8362473667744711251"
251251
],
252252
"ending rossby_radius_raw": [
253-
"-6571806121970519316"
253+
"-6698230557350466130"
254254
],
255255
"ending bczone_radius": [
256256
"0"
257257
],
258258
"ending bih_viscosity": [
259-
"57617405659924526"
259+
"57182947761661428"
260260
],
261261
"ending lap_viscosity": [
262-
"7899190056081456500"
262+
"7904143390511129282"
263263
],
264264
"eta_t": [
265-
"6161375685313418067"
265+
"6161159626392907795"
266266
],
267267
"eta_u": [
268-
"-7613125353148496393"
268+
"-7612988943494967720"
269269
],
270270
"deta_dt": [
271-
"-3101345371338131743"
271+
"-2973638314376197916"
272272
],
273273
"eta_t_bar": [
274-
"6124898491543914122"
274+
"6124649857904569236"
275275
],
276276
"pbot_t": [
277-
"768621698378111673"
277+
"768589835532069830"
278278
],
279279
"pbot_u": [
280-
"4694980318609943866"
280+
"4694936478080650123"
281281
],
282282
"dpbot_dt": [
283283
"0"
284284
],
285285
"anompb": [
286-
"2544953560570938597"
286+
"2542189813492132244"
287287
],
288288
"anompb_bar": [
289289
"0"
290290
],
291291
"patm_t": [
292-
"1277686136693360111"
292+
"1278141349087473688"
293293
],
294294
"dpatm_dt": [
295-
"446453679547420133"
295+
"1028909402687389058"
296296
],
297297
"ps": [
298-
"3061637961880775951"
298+
"3061932360241695959"
299299
],
300300
"grad_ps_1": [
301-
"-3959411162369935065"
301+
"-3872606717868668054"
302302
],
303303
"grad_ps_2": [
304-
"-4996818543487856141"
304+
"4291504810860205285"
305305
],
306306
"grad_anompb_1": [
307307
"0"
@@ -310,19 +310,19 @@
310310
"0"
311311
],
312312
"udrho": [
313-
"-2356760011511116244"
313+
"7031005717166629232"
314314
],
315315
"vdrho": [
316-
"-8781352646959363100"
316+
"372523632993106071"
317317
],
318318
"conv_rho_ud_t": [
319-
"-5507600427209029575"
319+
"1201154916994284767"
320320
],
321321
"source": [
322-
"-8993031940889889135"
322+
"-283301976898998809"
323323
],
324324
"eta smoother": [
325-
"230340095964886673"
325+
"-283301976898998809"
326326
],
327327
"pbot smoother": [
328328
"0"
@@ -331,82 +331,82 @@
331331
"-1895931827608754767"
332332
],
333333
"forcing_u_bt": [
334-
"-3136703274888076137"
334+
"-3150457815648098949"
335335
],
336336
"forcing_v_bt": [
337-
"8700895915204830720"
337+
"-650449964784683174"
338338
],
339339
"Thickness%rho_dzt(taup1)": [
340-
"-7573984875484904866"
340+
"-7574113435019564955"
341341
],
342342
"Thickness%rho_dzu(taup1)": [
343-
"-2853376551296498678"
343+
"-2853601705219314883"
344344
],
345345
"Thickness%mass_u(taup1)": [
346-
"-1948411591266333856"
346+
"-1948459141432835442"
347347
],
348348
"Thickness%rho_dzten(1)": [
349-
"-146755831558316503"
349+
"-147221993521406194"
350350
],
351351
"Thickness%rho_dzten(2)": [
352-
"8987970859229810697"
352+
"8987706024524141805"
353353
],
354354
"Thickness%rho_dztr": [
355-
"-8038312981010747672"
355+
"-8038142783438738963"
356356
],
357357
"Thickness%rho_dzur": [
358-
"-4034555766176540656"
358+
"-4034253568745076576"
359359
],
360360
"Thickness%rho_dzt_tendency": [
361-
"6713316401508424432"
361+
"-2987432461852069683"
362362
],
363363
"Thickness%dzt": [
364-
"4908973336939229075"
364+
"4908845811514219679"
365365
],
366366
"Thickness%dzten(1)": [
367-
"-6164112233980147368"
367+
"-6164575948049281865"
368368
],
369369
"Thickness%dzten(2)": [
370-
"2975626994392876169"
370+
"2975363972264387997"
371371
],
372372
"Thickness%dztlo": [
373-
"986807360076997412"
373+
"986679239372761119"
374374
],
375375
"Thickness%dztup": [
376-
"1782418745194850702"
376+
"1782291024993320730"
377377
],
378378
"Thickness%dzt_dst": [
379-
"-7865780516521161659"
379+
"-7865982744611385583"
380380
],
381381
"Thickness%dzwt(k=0)": [
382-
"-6948812284359905186"
382+
"-6948834417911293083"
383383
],
384384
"Thickness%dzwt(k=1:nk)": [
385-
"5767877666946609113"
385+
"5767752054820933428"
386386
],
387387
"Thickness%dzu": [
388-
"-7304745853323415838"
388+
"-7304973538368912800"
389389
],
390390
"Thickness%dzwu(k=0)": [
391-
"839987972390772064"
391+
"839951080633222217"
392392
],
393393
"Thickness%dzwu(k=1:nk)": [
394-
"8331178622371991319"
394+
"8330950160311223210"
395395
],
396396
"Thickness%depth_zt": [
397-
"6767401526917094171"
397+
"6767258652407765264"
398398
],
399399
"Thickness%geodepth_zt": [
400-
"3082306566114301333"
400+
"3082427966891324153"
401401
],
402402
"Thickness%depth_zu": [
403-
"-1709966305899429361"
403+
"-1710219946074549771"
404404
],
405405
"Thickness%depth_zwt": [
406-
"2790968639904761554"
406+
"2790821524652626416"
407407
],
408408
"Thickness%depth_zwu": [
409-
"-989718868962891745"
409+
"-989974394929147072"
410410
],
411411
"Thickness%depth_st": [
412412
"-2190684862846133381"
@@ -433,10 +433,10 @@
433433
"4640651303129875516"
434434
],
435435
"Thickness%mass_en(1)": [
436-
"3165586146189358125"
436+
"3165550813777416881"
437437
],
438438
"Thickness%mass_en(2)": [
439-
"3611943765974415881"
439+
"3611934796626198593"
440440
]
441441
}
442442
}

0 commit comments

Comments
 (0)