abort if Jint_{C,N,P,Si,Fe}tot or CISO_Jint_1[34]Ctot exceeds thresholds (bugfix for #1) #247
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…lds (bugfix for #1) remove 14C decay from CISO_Jint_14Ctot reintroduce setting POC%remin=0 below the sea-floor, to avoid using uninitialized values elsewher misc code cleanup Testing: marbl_dev_klindsay_n113_marbl_dev_n78_cesm_pop_2_1_20180205 aux_pop_MARBL cheyenne/{intel,gnu}: (baseline comparison to marbl_dev_klindsay_n113) except for tests mentioned below, all tests pass NLCOMP failed because of introduction of Jint_Ctot_thres_molpm2pyr BASELINE failed for ciso tests because of removal of 14C decay from CISO_Jint_14Ctot some MEMCOMP failures Files Modified: modified: autogenerated_src/default_settings.json modified: src/default_settings.yaml modified: src/marbl_ciso_mod.F90 modified: src/marbl_diagnostics_mod.F90 modified: src/marbl_mod.F90 modified: src/marbl_settings_mod.F90
change default frequency of full-depth Jint_*tot diagnostics to never
misc code cleanup
Testing:
marbl_dev_klindsay_n113_marbl_dev_n78_cesm_pop_2_1_20180205
aux_pop_MARBL cheyenne/{intel,gnu}: (baseline comparison to previous commit on bugfix/1 branch)
except for tests mentioned below, all tests pass
some MEMCOMP failures
Files Modified:
modified: autogenerated_src/default_diagnostics.json
modified: src/default_diagnostics.yaml
modified: src/marbl_ciso_mod.F90
modified: src/marbl_diagnostics_mod.F90
mnlevy1981
approved these changes
Mar 20, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
no corresponding changes in POP