Skip to content

Commit

Permalink
revert to less detailed diagnostics for 2017 and after: #11 (comment)
Browse files Browse the repository at this point in the history
  • Loading branch information
aekiss committed Apr 26, 2022
1 parent 0dd3110 commit 2a5cf7d
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 69 deletions.
20 changes: 10 additions & 10 deletions ice/cice_in.nml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
dumpfreq = 'm'
dumpfreq_n = 3
hist_avg = .true.
histfreq = 'd', 'm', 'h', 'x', 'x'
histfreq_n = 1, 1, 6, 1, 1
histfreq = 'd', 'm', 'x', 'x', 'x'
histfreq_n = 1, 1, 1, 1, 1
history_chunksize_x = 360
history_chunksize_y = 270
history_deflate_level = 1
Expand Down Expand Up @@ -179,19 +179,19 @@
/

&icefields_nml
f_aice = 'mdh'
f_aice = 'md'
f_aicen = 'm'
f_aisnap = 'x'
f_albice = 'x'
f_albpnd = 'x'
f_albsni = 'md'
f_albsno = 'x'
f_alidf_ai = 'md'
f_alidf_ai = 'm'
f_alidr = 'x'
f_alidr_ai = 'md'
f_alvdf_ai = 'md'
f_alidr_ai = 'm'
f_alvdf_ai = 'm'
f_alvdr = 'x'
f_alvdr_ai = 'md'
f_alvdr_ai = 'm'
f_angle = .true.
f_anglet = .true.
f_bounds = .false.
Expand Down Expand Up @@ -240,7 +240,7 @@
f_fswfac = 'x'
f_fswthru = 'x'
f_fswthru_ai = 'md'
f_fswup = 'md'
f_fswup = 'm'
f_fy = 'x'
f_hi = 'md'
f_hisnap = 'x'
Expand All @@ -262,7 +262,7 @@
f_sice = 'x'
f_sig1 = 'x'
f_sig2 = 'x'
f_sinz = 'md'
f_sinz = 'x'
f_snoice = 'md'
f_snow = 'x'
f_snow_ai = 'x'
Expand All @@ -281,7 +281,7 @@
f_strtlty = 'x'
f_tair = 'x'
f_tarea = .true.
f_tinz = 'md'
f_tinz = 'x'
f_tmask = .true.
f_tref = 'x'
f_trsig = 'x'
Expand Down
2 changes: 1 addition & 1 deletion lastdate.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2016-09-28
2016-12-27
42 changes: 6 additions & 36 deletions ocean/diag_table
Original file line number Diff line number Diff line change
Expand Up @@ -335,18 +335,6 @@ ACCESS-OM2-01
"ocean_model", "surface_pot_temp", "surface_pot_temp", "ocean-2d-surface_pot_temp-1-daily-min-ym%4yr%2mo", "all", "min", "none", 2


# 6-hourly 2d fields

"ocean-2d-surface_pot_temp-6-hourly-mean-ym%4yr%2mo", 6, "hours", 1, "days", "time", 1, "months"
"ocean_model", "surface_pot_temp", "surface_pot_temp", "ocean-2d-surface_pot_temp-6-hourly-mean-ym%4yr%2mo", "all", "average", "none", 2

"ocean-2d-surface_salt-6-hourly-mean-ym%4yr%2mo", 6, "hours", 1, "days", "time", 1, "months"
"ocean_model", "surface_salt", "surface_salt", "ocean-2d-surface_salt-6-hourly-mean-ym%4yr%2mo", "all", "average", "none", 2

"ocean-2d-mld-6-hourly-mean-ym%4yr%2mo", 6, "hours", 1, "days", "time", 1, "months"
"ocean_model", "mld", "mld", "ocean-2d-mld-6-hourly-mean-ym%4yr%2mo", "all", "average", "none", 2


# daily scalar snapshots

"ocean-scalar-1-daily-ym%4yr%2mo", 1, "days", 1, "days", "time", 1, "months"
Expand Down Expand Up @@ -541,43 +529,25 @@ ACCESS-OM2-01

# daily-mean-sampled-every-five-days 3d prognostic BGC fields

"oceanbgc-3d-adic-1-daily-mean-5-daily-ymd%4yr%2mo%2dy", 1, "days", 1, "days", "time", 5, "days", "2016 10 03 0 0 0", 1, "days"
"oceanbgc-3d-adic-1-daily-mean-5-daily-ymd%4yr%2mo%2dy", 1, "days", 1, "days", "time", 5, "days", "2017 01 01 0 0 0", 1, "days"
"ocean_model", "adic", "adic", "oceanbgc-3d-adic-1-daily-mean-5-daily-ymd%4yr%2mo%2dy", "all", "average", "none", 2

"oceanbgc-3d-dic-1-daily-mean-5-daily-ymd%4yr%2mo%2dy", 1, "days", 1, "days", "time", 5, "days", "2016 10 03 0 0 0", 1, "days"
"oceanbgc-3d-dic-1-daily-mean-5-daily-ymd%4yr%2mo%2dy", 1, "days", 1, "days", "time", 5, "days", "2017 01 01 0 0 0", 1, "days"
"ocean_model", "dic", "dic", "oceanbgc-3d-dic-1-daily-mean-5-daily-ymd%4yr%2mo%2dy", "all", "average", "none", 2

"oceanbgc-3d-o2-1-daily-mean-5-daily-ymd%4yr%2mo%2dy", 1, "days", 1, "days", "time", 5, "days", "2016 10 03 0 0 0", 1, "days"
"oceanbgc-3d-o2-1-daily-mean-5-daily-ymd%4yr%2mo%2dy", 1, "days", 1, "days", "time", 5, "days", "2017 01 01 0 0 0", 1, "days"
"ocean_model", "o2", "o2", "oceanbgc-3d-o2-1-daily-mean-5-daily-ymd%4yr%2mo%2dy", "all", "average", "none", 2

"oceanbgc-3d-no3-1-daily-mean-5-daily-ymd%4yr%2mo%2dy", 1, "days", 1, "days", "time", 5, "days", "2016 10 03 0 0 0", 1, "days"
"oceanbgc-3d-no3-1-daily-mean-5-daily-ymd%4yr%2mo%2dy", 1, "days", 1, "days", "time", 5, "days", "2017 01 01 0 0 0", 1, "days"
"ocean_model", "no3", "no3", "oceanbgc-3d-no3-1-daily-mean-5-daily-ymd%4yr%2mo%2dy", "all", "average", "none", 2

"oceanbgc-3d-fe-1-daily-mean-5-daily-ymd%4yr%2mo%2dy", 1, "days", 1, "days", "time", 5, "days", "2016 10 03 0 0 0", 1, "days"
"oceanbgc-3d-fe-1-daily-mean-5-daily-ymd%4yr%2mo%2dy", 1, "days", 1, "days", "time", 5, "days", "2017 01 01 0 0 0", 1, "days"
"ocean_model", "fe", "fe", "oceanbgc-3d-fe-1-daily-mean-5-daily-ymd%4yr%2mo%2dy", "all", "average", "none", 2

"oceanbgc-3d-phy-1-daily-mean-5-daily-ymd%4yr%2mo%2dy", 1, "days", 1, "days", "time", 5, "days", "2016 10 03 0 0 0", 1, "days"
"oceanbgc-3d-phy-1-daily-mean-5-daily-ymd%4yr%2mo%2dy", 1, "days", 1, "days", "time", 5, "days", "2017 01 01 0 0 0", 1, "days"
"ocean_model", "phy", "phy", "oceanbgc-3d-phy-1-daily-mean-5-daily-ymd%4yr%2mo%2dy", "all", "average", "none", 2


# 6-hourly 2d prognostic BGC fields

"oceanbgc-2d-surface_o2-6-hourly-mean-ym%4yr%2mo", 6, "hours", 1, "days", "time", 1, "months"
"ocean_model", "surface_o2", "surface_o2", "oceanbgc-2d-surface_o2-6-hourly-mean-ym%4yr%2mo", "all", "average", "none", 2

"oceanbgc-2d-surface_phy-6-hourly-mean-ym%4yr%2mo", 6, "hours", 1, "days", "time", 1, "months"
"ocean_model", "surface_phy", "surface_phy", "oceanbgc-2d-surface_phy-6-hourly-mean-ym%4yr%2mo", "all", "average", "none", 2

"oceanbgc-2d-surface_fe-6-hourly-mean-ym%4yr%2mo", 6, "hours", 1, "days", "time", 1, "months"
"ocean_model", "surface_fe", "surface_fe", "oceanbgc-2d-surface_fe-6-hourly-mean-ym%4yr%2mo", "all", "average", "none", 2

"oceanbgc-2d-surface_no3-6-hourly-mean-ym%4yr%2mo", 6, "hours", 1, "days", "time", 1, "months"
"ocean_model", "surface_no3", "surface_no3", "oceanbgc-2d-surface_no3-6-hourly-mean-ym%4yr%2mo", "all", "average", "none", 2

"oceanbgc-2d-radbio1-6-hourly-mean-ym%4yr%2mo", 6, "hours", 1, "days", "time", 1, "months"
"ocean_model", "radbio1", "radbio1", "oceanbgc-2d-radbio1-6-hourly-mean-ym%4yr%2mo", "all", "average", "none", 2


# daily 2d prognostic BGC fields

"oceanbgc-2d-surface_adic-1-daily-mean-ym%4yr%2mo", 1, "days", 1, "days", "time", 1, "months"
Expand Down
23 changes: 1 addition & 22 deletions ocean/diag_table_source.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -312,15 +312,6 @@ diag_table:
reduction_method: min # mean, snap, rms, pow##, min, max, or diurnal##
fields:
surface_pot_temp: # min for comparison with foundation temperature
'6-hourly 2d fields':
defaults: # these can be overridden for individual fields below
file_name_dimension: 2d # descriptor for filename, e.g. 3d, 2d, scalar
output_freq: 6 # integer: output sampling frequency in output_freq_units (0: every timestep; -1: only at end of run)
output_freq_units: hours # time units for output: years, months, days, hours, minutes, or seconds
fields:
surface_pot_temp:
surface_salt:
mld:
'daily scalar snapshots': # snapshots of global integrals give better parallel performance
defaults: # these can be overridden for individual fields below
file_name_dimension: scalar # descriptor for filename, e.g. 3d, 2d, scalar
Expand Down Expand Up @@ -471,7 +462,7 @@ diag_table:
file_duration_units: days
new_file_freq: 5
new_file_freq_units: days
start_time: [ 2016 10 03 0 0 0 ] # set_nextdate
start_time: [ 2017 01 01 0 0 0 ] # set_nextdate
file_name:
- file_name_prefix
- file_name_dimension
Expand All @@ -489,18 +480,6 @@ diag_table:
no3:
fe:
phy:
'6-hourly 2d prognostic BGC fields':
defaults: # these can be overridden for individual fields below
file_name_prefix: oceanbgc
file_name_dimension: 2d # descriptor for filename, e.g. 3d, 2d, scalar
output_freq: 6 # integer: output sampling frequency in output_freq_units (0: every timestep; -1: only at end of run)
output_freq_units: hours # time units for output: years, months, days, hours, minutes, or seconds
fields:
surface_o2:
surface_phy:
surface_fe:
surface_no3:
radbio1:
'daily 2d prognostic BGC fields':
defaults: # these can be overridden for individual fields below
file_name_prefix: oceanbgc
Expand Down

0 comments on commit 2a5cf7d

Please sign in to comment.