Allow repeat subcycle variables & nested subcycles of identical length#678
Conversation
| - Also tests subcycles: | ||
| - Nested subcycles | ||
| - A subcycle with dynamic iteration length (defined by a standard name) and a subcycle with fixed/integer iteration length | ||
| - Multiple ubcycles with same standard name defining the iteration length |
There was a problem hiding this comment.
| - Multiple ubcycles with same standard name defining the iteration length | |
| - Multiple subcycles with same standard name defining the iteration length |
| real(kind_phys), parameter :: effrl_expected = 5.0E-5 ! 50 microns, in meter | ||
| real(kind_phys), parameter :: effri_expected = 7.5E-5 ! 75 microns, in meter | ||
| real(kind_phys), parameter :: effrs_expected = 5.1E-4 ! 510 microns, in meter | ||
| real(kind_phys), parameter :: effrs_expected = 5.2E-4 ! 520 microns, in meter |
There was a problem hiding this comment.
Just curious, why this change? Is every subcycle adding 10 microns?
There was a problem hiding this comment.
correct, I modified the SDF to do a total of 4 subcycles (2 nested within 2) rather than 2.
Actually, now that I look at it, I don't understand it! The effr_calc_run subroutine that is run 4 times instead of 2 adds 10.0 / 6.0 microns each iteration, which doesn't add up either with my mods or the existing expectation... I shall look into this!
There was a problem hiding this comment.
Nevermind, it used to be doing 3*2 = 6 subcycles, so adding 10/6 6 times for a total of 10 microns.
With my updates, it's now doing 322 = 12 subcycles, so adding 20 microns.
So all is OK
gold2718
left a comment
There was a problem hiding this comment.
I wonder if all the behavior is being checked.
gold2718
left a comment
There was a problem hiding this comment.
Thanks for adding the check!
|
@mkavulich This one has been approved and is ready to merge. |
|
@mkavulich This has three approvals, can we merge please? |
loopvariables)User interface changes?: No
closes #677
Testing: