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

01deg jra55v140 iaf cycle4 #13

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions ice/cice_in.nml
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@
tr_bgc_dmspd_sk = .false.
tr_bgc_dmspp_sk = .false.
tr_bgc_sil_sk = .false.
tr_brine = .true.
tr_brine = .false.
/

&forcing_nml
Expand Down Expand Up @@ -346,7 +346,7 @@
f_btin = 'x'
f_faero_atm = 'x'
f_faero_ocn = 'x'
f_fbri = 'm'
f_fbri = 'x'
f_fn = 'x'
f_fn_ai = 'm'
f_fnh = 'x'
Expand All @@ -356,7 +356,7 @@
f_fsil = 'x'
f_fsil_ai = 'x'
f_grownet = 'x'
f_hbri = 'm'
f_hbri = 'x'
f_ppnet = 'm'
/

Expand Down
1 change: 0 additions & 1 deletion metadata.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,3 @@ keywords:
- jra55-do-v1.4.0
- iaf
- bgc

24 changes: 6 additions & 18 deletions ocean/diag_table
Original file line number Diff line number Diff line change
Expand Up @@ -422,26 +422,8 @@ ACCESS-OM2-01
"ocean_model", "zoo", "zoo", "oceanbgc-3d-zoo-1-monthly-mean-y%4yr", "all", "average", "none", 2


# monthly 3d diagnostic BGC fields

"oceanbgc-3d-npp3d-1-monthly-mean-y%4yr", 1, "months", 1, "days", "time", 1, "months"
"ocean_model", "npp3d", "npp3d", "oceanbgc-3d-npp3d-1-monthly-mean-y%4yr", "all", "average", "none", 2

"oceanbgc-3d-pprod_gross-1-monthly-mean-y%4yr", 1, "months", 1, "days", "time", 1, "months"
"ocean_model", "pprod_gross", "pprod_gross", "oceanbgc-3d-pprod_gross-1-monthly-mean-y%4yr", "all", "average", "none", 2

"oceanbgc-3d-radbio3d-1-monthly-mean-y%4yr", 1, "months", 1, "days", "time", 1, "months"
"ocean_model", "radbio3d", "radbio3d", "oceanbgc-3d-radbio3d-1-monthly-mean-y%4yr", "all", "average", "none", 2


# monthly 2d diagnostic BGC fields

"oceanbgc-2d-paco2-1-monthly-mean-y%4yr", 1, "months", 1, "days", "time", 1, "months"
"ocean_model", "paco2", "paco2", "oceanbgc-2d-paco2-1-monthly-mean-y%4yr", "all", "average", "none", 2

"oceanbgc-2d-pco2-1-monthly-mean-y%4yr", 1, "months", 1, "days", "time", 1, "months"
"ocean_model", "pco2", "pco2", "oceanbgc-2d-pco2-1-monthly-mean-y%4yr", "all", "average", "none", 2

"oceanbgc-2d-stf03-1-monthly-mean-y%4yr", 1, "months", 1, "days", "time", 1, "months"
"ocean_model", "stf03", "stf03", "oceanbgc-2d-stf03-1-monthly-mean-y%4yr", "all", "average", "none", 2

Expand All @@ -454,6 +436,12 @@ ACCESS-OM2-01
"oceanbgc-2d-wdet100-1-monthly-mean-y%4yr", 1, "months", 1, "days", "time", 1, "months"
"ocean_model", "wdet100", "wdet100", "oceanbgc-2d-wdet100-1-monthly-mean-y%4yr", "all", "average", "none", 2

"oceanbgc-2d-npp2d-1-monthly-mean-y%4yr", 1, "months", 1, "days", "time", 1, "months"
"ocean_model", "npp2d", "npp2d", "oceanbgc-2d-npp2d-1-monthly-mean-y%4yr", "all", "average", "none", 2

"oceanbgc-2d-pprod_gross_2d-1-monthly-mean-y%4yr", 1, "months", 1, "days", "time", 1, "months"
"ocean_model", "pprod_gross_2d", "pprod_gross_2d", "oceanbgc-2d-pprod_gross_2d-1-monthly-mean-y%4yr", "all", "average", "none", 2


# monthly scalar BGC timeseries snapshots

Expand Down
17 changes: 3 additions & 14 deletions ocean/diag_table_source.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -406,17 +406,6 @@ diag_table:
o2:
phy:
zoo:
'monthly 3d diagnostic BGC fields':
defaults: # these can be overridden for individual fields below
file_name_prefix: oceanbgc
file_name_dimension: 3d # descriptor for filename, e.g. 3d, 2d, scalar
output_freq: 1 # integer: output sampling frequency in output_freq_units (0: every timestep; -1: only at end of run)
output_freq_units: months # time units for output: years, months, days, hours, minutes, or seconds
file_name_date: "y%4yr" # run date/time of file opening; format: %, 1 digit (#digits), one of (yr, mo, dy, hr, mi, sc); date/time components will be separated by _ in filename.
fields:
npp3d:
pprod_gross:
radbio3d:
'monthly 2d diagnostic BGC fields':
defaults: # these can be overridden for individual fields below
file_name_prefix: oceanbgc
Expand All @@ -425,12 +414,12 @@ diag_table:
output_freq_units: months # time units for output: years, months, days, hours, minutes, or seconds
file_name_date: "y%4yr" # run date/time of file opening; format: %, 1 digit (#digits), one of (yr, mo, dy, hr, mi, sc); date/time components will be separated by _ in filename.
fields:
paco2:
pco2:
stf03: # o2 air-to-sea flux
stf07: # dic air-to-sea flux
stf09: # adic air-to-sea flux
wdet100:
wdet100:
npp2d:
pprod_gross_2d:
'monthly scalar BGC timeseries snapshots': # snapshots of global integrals give better parallel performance
defaults: # these can be overridden for individual fields below
file_name_prefix: oceanbgc
Expand Down