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

Enhancement/low hanging fruit #229

Merged
merged 9 commits into from
Feb 21, 2018
Merged

Enhancement/low hanging fruit #229

merged 9 commits into from
Feb 21, 2018

Conversation

mnlevy1981
Copy link
Collaborator

This branch will contain fixes for #226, #200, #150, #192, and #82. The corresponding POP tag will fix #202.

Fixes for #226, #200, and #150 are already on this branch; I will comment when the other two issues are fixed as well.

If an autotroph is not a calcifier, these diagnostics are not needed.
Rather than an optional intent(out) to init(), GCMs can determine the
number of MARBL tracers by looking at

size(marbl_instance%tracer_metadata)
When calling compute_vertical_integral(), if shallow_depth is not
specified then the previous default (100.0e2_r8) is used.
Can also handle case where

caco3_bury_thres_iopt = caco3_bury_thres_iopt_omega_calc

This required passing carbonate to marbl_ciso_set_interior_forcing; I
also cleaned up the interface to
marbl_ciso_mod:compute_particulate_terms to be more similar to
marbl_mod:marbl_compute_particulate_terms (passing full
marbl_domain_type instead of individual components and also reordering
arguments)
@mnlevy1981
Copy link
Collaborator Author

Fix for #82 changes answers when ciso_on = .true.

No need to request col_frac from GCM if there is only one subcolumn
(because that subcolumn is 100% of total column)
@mnlevy1981
Copy link
Collaborator Author

mnlevy1981 commented Feb 14, 2018

I don't have a good way to test the fix for #192 in 55d220d, POP uses at least two PAR subcolumns (simplest case is one subcolumn under atmosphere and the other under ice).

Rather than making sure parameter settings are consistent with one another
throughout marbl_init_parameters_{pre,post}_tracers(), there is now a single
routine that is called at the end of marbl_instance%init().

There is currently just one consistency check (ladjust_bury_coeff can not be
.true. unless the GCM allows global operators), but when future checks are
added it will be clear where they should go.
@mnlevy1981
Copy link
Collaborator Author

Also added a fix for #228

Use ind value to determine whether to compute diagnostics (ind == 0 means it
was not defined)

Use marbl_interior_share_type to pass CO3_sat_calcite to CISO rather than
passing the carbonate_type, and also clean up interface of
compute_particulate_terms().
@mnlevy1981 mnlevy1981 merged commit 9dc105a into marbl-ecosys:master Feb 21, 2018
@mnlevy1981 mnlevy1981 deleted the enhancement/low-hanging-fruit branch February 21, 2018 23:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant