Skip to content

Commit

Permalink
+(*)Prohibit WARSAW_SUM_ORDER and MERGED_CONTINUITY
Browse files Browse the repository at this point in the history
  Eliminate the option of using WARSAW_SUM_ORDER when MERGED_CONTINUITY=True.
All answers are bitwise identical in existing test cases.
  • Loading branch information
Hallberg-NOAA committed Feb 15, 2019
1 parent cf06501 commit ed9505f
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion src/SIS_dyn_trans.F90
Original file line number Diff line number Diff line change
Expand Up @@ -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.", &
Expand Down

0 comments on commit ed9505f

Please sign in to comment.