From ed9505f58e1b9dcabf7b8b7b9359a6ba796316df Mon Sep 17 00:00:00 2001 From: Robert Hallberg Date: Fri, 15 Feb 2019 11:23:24 -0500 Subject: [PATCH] +(*)Prohibit WARSAW_SUM_ORDER and MERGED_CONTINUITY Eliminate the option of using WARSAW_SUM_ORDER when MERGED_CONTINUITY=True. All answers are bitwise identical in existing test cases. --- src/SIS_dyn_trans.F90 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/SIS_dyn_trans.F90 b/src/SIS_dyn_trans.F90 index 7c599c04..6892d61e 100644 --- a/src/SIS_dyn_trans.F90 +++ b/src/SIS_dyn_trans.F90 @@ -2134,7 +2134,10 @@ subroutine SIS_dyn_trans_init(Time, G, IG, param_file, diag, CS, output_dir, Tim "If true, use the order of sums in the Warsaw version of SIS2. \n"//& "The default is the opposite of MERGED_CONTINUITY. \n"//& "This option exists for backward compatibilty but may \n"//& - "eventually be obsoleted.", default=.not.CS%merged_cont) + "eventually be obsoleted.", & + default=.not.CS%merged_cont, do_not_log=CS%merged_cont) + if (CS%merged_cont .and. CS%Warsaw_sum_order) & + call SIS_error(FATAL, "WARSAW_SUM_ORDER can not be true if MERGED_CONTINUITY=True.") call get_param(param_file, mdl, "TIMEUNIT", Time_unit, & "The time unit for ICE_STATS_INTERVAL.", &