From 2a5cf7dc7ae02abc3a0ed50a2cbf57c88c2f6b36 Mon Sep 17 00:00:00 2001 From: Andrew Kiss <31054815+aekiss@users.noreply.github.com> Date: Tue, 26 Apr 2022 10:28:08 +1000 Subject: [PATCH] revert to less detailed diagnostics for 2017 and after: https://github.com/COSIMA/01deg_jra55_iaf/issues/11#issuecomment-1057677069 --- ice/cice_in.nml | 20 ++++++++--------- lastdate.txt | 2 +- ocean/diag_table | 42 ++++++------------------------------ ocean/diag_table_source.yaml | 23 +------------------- 4 files changed, 18 insertions(+), 69 deletions(-) diff --git a/ice/cice_in.nml b/ice/cice_in.nml index b08498b3..a2e0cbb7 100644 --- a/ice/cice_in.nml +++ b/ice/cice_in.nml @@ -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 @@ -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. @@ -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' @@ -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' @@ -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' diff --git a/lastdate.txt b/lastdate.txt index fd365840..b065e5cd 100644 --- a/lastdate.txt +++ b/lastdate.txt @@ -1 +1 @@ -2016-09-28 +2016-12-27 diff --git a/ocean/diag_table b/ocean/diag_table index 56b0fe03..a94982d4 100644 --- a/ocean/diag_table +++ b/ocean/diag_table @@ -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" @@ -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" diff --git a/ocean/diag_table_source.yaml b/ocean/diag_table_source.yaml index 1b639563..1a3d42f5 100755 --- a/ocean/diag_table_source.yaml +++ b/ocean/diag_table_source.yaml @@ -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 @@ -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 @@ -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