-
Notifications
You must be signed in to change notification settings - Fork 317
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
Ponded water/alternative solutions #191
Conversation
Comment from @billsacks Sep 7, 2017 @martynpclark @dlawrenncar @swensosc @barlage @bandre-ucar @mvertens Here is the pdf I referenced in today's meeting: Modern.Fortran.in.Practice.-.section.5.3.pdf Specifically, see the "Type-Bound Procedures" implementation. There is a more involved example that follows a similar pattern in the book "Scientific Software Design: The Object-Oriented Way" - see section 6.2.1. That book is available in the NCAR library (http://opencat.library.ucar.edu/cgi-bin/koha/opac-detail.pl?biblionumber=58255&query_desc=kw%2Cwrdl%3A%20scientific%20software%20design). (Disclaimer: I have only given that a quick skim, so may be missing something.) After giving this more thought, while I like Martyn's proposed solution, I think I'd prefer something like the object-oriented one illustrated in the two above references. (Or the solution that @bandre-ucar proposed, which feels like it would end up looking somewhat similar in the end.) A big advantage is that it is more generally applicable: you don't need to have a containing subroutine that sets all of the input parameters. But a lot of my feeling is based on the problems I have found with using internal subroutines like this, where you access variables from the enclosing routine:
|
Comment from @billsacks Sep 7, 2017 @martynpclark I think you said that drainMax is supposed to be inputRate (or vice versa); am I remembering right? (So that I can show some alternatives correctly.) |
Comment from @martynpclark Sep 7, 2017 @billsacks -- yes, |
! procedure starts here | ||
arg = exp(-storage/smoothScale) | ||
flux = -inputRate*(1._dp - arg) | ||
if(present(dfdx)) dfdx = -inputRate*arg/smoothScale |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Comment from @martynpclark Sep 7, 2017
inputRate
should be drainMax
funcName=>drainPond | ||
call implicitEuler(funcName, dtime, h2osfc(c), h2osfc1, err, message) | ||
if(err/=0) call endrun(subname // ':: '//trim(message)) | ||
call drainPond(h2osfc1, qflx_h2osfc_drain(c)) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Comment from @billsacks Sep 7, 2017
Is this a general pattern - that, to get the final flux with implicit Euler, we do a final function call like this? If so, can this final call be incorporated into the implicitEuler routine itself?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Comment from @martynpclark Sep 7, 2017
Yes. The final flux should be a function of the state at the end of the time step.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Comment from @billsacks Sep 11, 2017
Addressed in NCAR/clm-ctsm#14 in NCAR/clm-ctsm@315c14b
Update: This is now #192 , commit b872d21 . The comment referenced in that commit is the one right above: https://github.com/ESCOMP/ctsm/pull/191/files#r159001381
Comment from @billsacks Sep 7, 2017 In today's meeting, we discussed the fact that this implementation will have performance problems - and particularly will not allow vectorization - because the routine is called separately for each point, rather than operating on all points. We discussed refactoring this so that the flux routine operates on arrays rather than scalars. However, I'm not sure how to fit that in to the integration routine, which has an outer loop over iterations, with a convergence criteria for each point. Does anyone know how this is done elsewhere in CESM (or other models) - so that you can have vectorizable code in the context of a solver like this? |
Comment from @martynpclark Sep 8, 2017 @billsacks -- there are iterative solutions in other parts of CLM (e.g., see line 754 in |
Comment from @billsacks Sep 8, 2017 @martynpclark Thanks for that pointer. That example handles this well, from a vectorization perspective, by passing a temporary filter to each science routine. Each time through the iteration loop, the filter is recreated via this code at the end of the iteration loop: ! Test for convergence
itlef = itlef+1
if (itlef > itmin) then
do f = 1, fn
p = filterp(f)
dele(p) = abs(efe(p)-efeb(p))
efeb(p) = efe(p)
det(p) = max(del(p),del2(p))
end do
fnold = fn
fn = 0
do f = 1, fnold
p = filterp(f)
if (.not. (det(p) < dtmin .and. dele(p) < dlemin)) then
fn = fn + 1
filterp(fn) = p
end if
end do
end if That solution makes sense to me in a case like CanopyFluxes, where there is a lot of work that happens in the iteration loop. In the example in this PR, the overhead of recreating the filter every time through the iteration loop may not pay for itself, since there isn't much work done in the science routine. That said, it may be worth going with the filter solution anyway. Another alternative (simpler, and good enough or better in terms of performance when there isn't much work done in the flux calculation routine) would be: Have a logical array passed to the flux calculation routine that says whether we have converged at each point. Then the loop in the science routine would look like: do fn = 1, num_f
n = filter_f(fn)
if (not_converged(fn)) then
! do calculations
end if
end do My understanding is that loops with conditionals can sometimes be vectorized, though maybe not efficiently. (I think the machine may compute the result for all elements, then throw out the ones where the conditional was false.) Before settling on a solution, we should probably do some timing tests of a few different approaches:
|
Comment from @billsacks Sep 8, 2017 @martynpclark I was going to spend part of today illustrating the object-oriented approach I discussed yesterday. Would it be more useful if I:
or
I think you can see the differences between the internal subroutine approach and OO approach about equally in scalar or array form, so I'm happy to do this in either order if one seems more useful to you. |
Comment from @martynpclark Sep 8, 2017 @billsacks -- thanks. Just FYSA, the example I presented was deliberately simple, which was done in order to make it easy to illustrate the implicit Euler approach. In practice most implementations will be much more complex (i.e., a large amount of code in the flux+derivative subroutine). We still may have some cases where the function call in the implicit Euler is trivial. |
Comment from @billsacks Sep 8, 2017
Okay, then going with a filter-based approach like the one in CanopyFluxes is probably a good way to go, though I still think we should do some timings before settling on this completely. |
Comment from @martynpclark Sep 8, 2017 @billsacks -- we would never actually use the implicit Euler in this case, since we are implementing operator splitting and the analytical solution is available. This will become more clear once we move to solutions for the complete state equation. |
Comment from @martynpclark Sep 8, 2017 Agreed that we should look at the timings. |
Comment from @martynpclark Sep 8, 2017 @billsacks -- in terms of the path forward: Either way is fine, whatever is easiest for you. I've read the book chapter that you sent and I think I understand the approach. |
Comment from @martynpclark Sep 8, 2017 @billsacks -- your code block do fn = 1, num_f
n = filter_f(fn)
if (not_converged(fn)) then
! do calculations
end if
end do seems much easier to understand. Is there a reason why the other (longer) code block is preferable? |
Comment from @billsacks Sep 8, 2017 @martynpclark I should first point out that the key part of the longer code block is just the second half: fnold = fn
fn = 0
do f = 1, fnold
p = filterp(f)
if (.not. (det(p) < dtmin .and. dele(p) < dlemin)) then
fn = fn + 1
filterp(fn) = p
end if
end do (The other part is needed in either case, I think.) This rebuilding of the filter replaces the not_converged logical. The reason this is preferable (in principle) is the same reason that we have filters at all in CLM: It's more efficient in general - and especially in a context of vectorization - to loop over some subset of indices rather than looping over all indices (or a larger subset of indices) with a conditional inside the loop. That said, I don't think anyone has done timing tests of the actual impact of this with recent machines / compilers. |
I'm closing this PR that was really mainly opened for discussion purposes. |
I have deleted this branch. Its entire history is contained in the pondedWater/alternativeSolutions_oo branch, which currently resides on my fork. The head of the pondedWater/alternativeSolutions branch was commit 0041a92. |
7b6d92ef6 Merge pull request #198 from johnpaulalex/gitdir 927ce3a98 Merge pull request #197 from johnpaulalex/testpath a04f1148f Merge pull request #196 from johnpaulalex/readmod d9c14bf25 Change the rest of the methods to use -C. Still some usage of getcwd in test_unit_repository_git. 332b10640 Fix incorrect logged path of checkout_externals in test_sys_checkout: it was basically the parent of the current directory, which varies throughout the test. (it called abspath with '{0}/../../', which adds arbitrary and not-interpolated subdir '{0}' to the path, then removes it and removes one more level). 932a7499b Remove printlog from read_gitmodules_file since read_externals_description_file() already has a nearly-the-same printlog (but add it to the other caller). 5d13719ed Merge pull request #195 from johnpaulalex/check_repo 423395449 Update utest to mock _git_remote_verbose in a new way, since it is now called via the GitRepository class rather than on the specific GitRepository instance. d7a42ae96 Check that desired repo was actually checked out. 71596bbc1 Merge pull request #194 from johnpaulalex/manic2 4c96e824e Make the MANIC_TEST_BARE_REPO_ROOT env var special - give it a constant for easy tracking, and automatically tear it down after each test. 259bfc04d test_sys_checkout: use actual paths in on-the-fly configs rather than MANIC_TEST_BARE_REPO_ROOT env var. This will make it easier to test (in the near future) that checkout_externals actually checked out the desired repo dir. 557bbd6eb Merge pull request #193 from johnpaulalex/manic 5314eede1 Remove MANIC_TEST_TMP_REPO_ROOT environment variable in favor of module-level variable. 345fc1e14 Merge pull request #191 from johnpaulalex/test_doc12 2117b843c test_sys_checkout: verify that basic by-tag/branch/hash tests actually take us to the correct git tag/branch/hash. 94d6e5f2b Merge pull request #190 from johnpaulalex/test_doc11 3ff33a6a8 Inline local-path-creation methods 47dea7f64 Merge pull request #189 from johnpaulalex/test_doc10 9ea75cbf8 Grab-bag of renamings: Remove redundant _NAME from repo constants, and consistently add _REPO suffix (This causes the majority of diffs). c0c847ec8 Merge pull request #188 from johnpaulalex/test_doc9 2dd5ce0f7 test_sys_checkout.py: only check for correct 'required' or 'optional' state in the test that exercises required vs optional behavior. Removed a lot of boilerplate. eb3085984 Merge pull request #187 from johnpaulalex/test_doc8 1832e1f84 test_sys_checkout: Simplify many tests to only use a single external. 8689d61ec Merge pull request #186 from johnpaulalex/test_doc7 fbee4253e Grab bag of test_sys_checkout cleanups: Doc inside of each test more clearly/consistently. TestSysCheckoutSVN didn’t get the inlining-of-helper-methods treatment, now it has that. Move various standalone repo helper methods (like create_branch) into a RepoUtils class. README.md was missing newlines when rendered as markdown. Doc the return value of checkout.main Fix test_container_exclude_component - it was looking for the wrong key (which is never present); now it looks for the correct key. f0ed44a6e Merge pull request #185 from johnpaulalex/test_doc6 a3d59f5f2 Merge pull request #184 from johnpaulalex/test_doc5 5329c8ba7 test_sys_checkout: Inline config generation functions that are only called once. 464f2c7a7 test_sys_checkout: Inline another layer (per-config-file checks). Rename the 4 methods that are used multiple times, to reflect what they do rather than what they're called. 8872c0df6 Merge pull request #183 from johnpaulalex/doc_test4 c045335f6 Merge pull request #182 from johnpaulalex/doc_test3 c583b956e Merge pull request #181 from johnpaulalex/doc_test2 e01cfe278 test_sys_checkout: less confusing handling of return values from checkout_externals. Specifically, when doing a checkout, don't return tree_status from _before_ the checkout. Make a new wrapper to call checkout_externals a second time, to calculate the new status after a checkout (very frequent pattern). 23286818c test_sys_checkout: Remove another layer (which generates test component names) c3717b6bc Merge pull request #180 from johnpaulalex/doc_test 36d7a4434 test_sys_checkout.py: remove one layer of functions (that check for local status enums). No-op. 2c4584bf7 More documentation about tests: * contents of test repositories (n a new README.md) * various constants in test_sys_checkout.py that point to those contents, and terminology like container/simple/mixed. * in each test method, the scenarios being tested. * The coupling between test methods. 55e74bd0a Merge pull request #179 from johnpaulalex/circ 66be84290 Remove circular dependency by making _External stop doing tricky things with sourcetrees. git-subtree-dir: manage_externals git-subtree-split: 7b6d92ef689e2f65733e27f8635ab91fb341356b
0f884bfec Merge pull request #205 from jedwards4b/sunset_svn_git_access 82a5edf79 merge in billsacks:svn_testing_no_github 17532c160 Use a local svn repo for testing 9c904341a different method to determine if in tests 539952ebd remove debug print statement cc5434fa7 fix submodule testing 1d7f28840 remove broken tests 04e94a519 provide a meaningful error message 38bcc0a8c Merge pull request #201 from jedwards4b/partial_match b4466a5aa remove debug print statement c3cf3ec35 fix issue with partial branch match 7b6d92ef6 Merge pull request #198 from johnpaulalex/gitdir 927ce3a98 Merge pull request #197 from johnpaulalex/testpath a04f1148f Merge pull request #196 from johnpaulalex/readmod d9c14bf25 Change the rest of the methods to use -C. Still some usage of getcwd in test_unit_repository_git. 332b10640 Fix incorrect logged path of checkout_externals in test_sys_checkout: it was basically the parent of the current directory, which varies throughout the test. (it called abspath with '{0}/../../', which adds arbitrary and not-interpolated subdir '{0}' to the path, then removes it and removes one more level). 932a7499b Remove printlog from read_gitmodules_file since read_externals_description_file() already has a nearly-the-same printlog (but add it to the other caller). 5d13719ed Merge pull request #195 from johnpaulalex/check_repo 423395449 Update utest to mock _git_remote_verbose in a new way, since it is now called via the GitRepository class rather than on the specific GitRepository instance. d7a42ae96 Check that desired repo was actually checked out. 71596bbc1 Merge pull request #194 from johnpaulalex/manic2 4c96e824e Make the MANIC_TEST_BARE_REPO_ROOT env var special - give it a constant for easy tracking, and automatically tear it down after each test. 259bfc04d test_sys_checkout: use actual paths in on-the-fly configs rather than MANIC_TEST_BARE_REPO_ROOT env var. This will make it easier to test (in the near future) that checkout_externals actually checked out the desired repo dir. 557bbd6eb Merge pull request #193 from johnpaulalex/manic 5314eede1 Remove MANIC_TEST_TMP_REPO_ROOT environment variable in favor of module-level variable. 345fc1e14 Merge pull request #191 from johnpaulalex/test_doc12 2117b843c test_sys_checkout: verify that basic by-tag/branch/hash tests actually take us to the correct git tag/branch/hash. 94d6e5f2b Merge pull request #190 from johnpaulalex/test_doc11 3ff33a6a8 Inline local-path-creation methods 47dea7f64 Merge pull request #189 from johnpaulalex/test_doc10 9ea75cbf8 Grab-bag of renamings: Remove redundant _NAME from repo constants, and consistently add _REPO suffix (This causes the majority of diffs). c0c847ec8 Merge pull request #188 from johnpaulalex/test_doc9 2dd5ce0f7 test_sys_checkout.py: only check for correct 'required' or 'optional' state in the test that exercises required vs optional behavior. Removed a lot of boilerplate. eb3085984 Merge pull request #187 from johnpaulalex/test_doc8 1832e1f84 test_sys_checkout: Simplify many tests to only use a single external. 8689d61ec Merge pull request #186 from johnpaulalex/test_doc7 fbee4253e Grab bag of test_sys_checkout cleanups: Doc inside of each test more clearly/consistently. TestSysCheckoutSVN didn’t get the inlining-of-helper-methods treatment, now it has that. Move various standalone repo helper methods (like create_branch) into a RepoUtils class. README.md was missing newlines when rendered as markdown. Doc the return value of checkout.main Fix test_container_exclude_component - it was looking for the wrong key (which is never present); now it looks for the correct key. f0ed44a6e Merge pull request #185 from johnpaulalex/test_doc6 a3d59f5f2 Merge pull request #184 from johnpaulalex/test_doc5 5329c8ba7 test_sys_checkout: Inline config generation functions that are only called once. 464f2c7a7 test_sys_checkout: Inline another layer (per-config-file checks). Rename the 4 methods that are used multiple times, to reflect what they do rather than what they're called. 8872c0df6 Merge pull request #183 from johnpaulalex/doc_test4 c045335f6 Merge pull request #182 from johnpaulalex/doc_test3 c583b956e Merge pull request #181 from johnpaulalex/doc_test2 e01cfe278 test_sys_checkout: less confusing handling of return values from checkout_externals. Specifically, when doing a checkout, don't return tree_status from _before_ the checkout. Make a new wrapper to call checkout_externals a second time, to calculate the new status after a checkout (very frequent pattern). 23286818c test_sys_checkout: Remove another layer (which generates test component names) c3717b6bc Merge pull request #180 from johnpaulalex/doc_test 36d7a4434 test_sys_checkout.py: remove one layer of functions (that check for local status enums). No-op. 2c4584bf7 More documentation about tests: * contents of test repositories (n a new README.md) * various constants in test_sys_checkout.py that point to those contents, and terminology like container/simple/mixed. * in each test method, the scenarios being tested. * The coupling between test methods. 55e74bd0a Merge pull request #179 from johnpaulalex/circ 66be84290 Remove circular dependency by making _External stop doing tricky things with sourcetrees. 82d3b247f Merge pull request #178 from johnpaulalex/test_doc 3223f49ea Additional documentation of system tests - global variables, method descriptions. 45b7c01c3 Merge pull request #177 from jedwards4b/git_workflow ace90b2c2 try setting credentials this way f4d6aa933 try setting credentials this way 1d61a6944 use this to set git credentials 7f9d330e1 use this to set git credentials 5ac731b85 add tmate code 836847be7 get git workflow working dcd462d71 Merge pull request #176 from jedwards4b/add_github_testing 2d2479e9d Merge pull request #175 from johnpaulalex/fix 711a53fdf add github testing of prs and automatic tagging of main cfe0f888a fix typos 5665d6140 Fix broken checkout behavior introduced by PR #172. 27909e255 Merge pull request #173 from johnpaulalex/readall 00ad0440b Further tiny refactorings and docs of checkout API (no-op). Remove unused load_all param in _External.checkout(). Rename _External.checkout_externals() to checkout_subexternals(), to remove the ambiguity about whether the main external pointed to by the _External is itelf checked out (it is not) Clarify load_all documentation - it’s always recursive, but applies different criteria at each level. Rename variables in checkout.py (e.g. ext_description) to match the equivalent code in sourcetree.py. 2ea3d1a3a Merge pull request #172 from johnpaulalex/fixit 43bf8092c Merge pull request #171 from johnpaulalex/docstatus e6aa7d21e Merge pull request #170 from johnpaulalex/printdir adbd71557 On checkout, refresh locally installed optional packages regardless of whether -o is passed in. add074593 Comment tweaks, and fix 'ppath' typo 696527cb8 Document the format of various status dictionaries, and the various paths and path components within an _External. c677b9403 When processing an external, print out its path in addition to the base filename (to disambiguate all the externals.cfg's) 975d7fd5a Merge pull request #169 from johnpaulalex/docfix_branch 09709e36d Document _Externals.status(). The original comment was apparently copy-pasted from checkout(). 1d880e090 Merge pull request #167 from billsacks/fix_svn_on_windows 3510da848 Tweak a unit test to improve coverage eb7fc1368 Handle the possibility that the URL already ends with '/' 02ea87e3d Fix svn URLs on Windows b1c02ab54 Merge pull request #165 from gold2718/doc_fix 9f4be8c7b Add documentation about externals = None feature a3b3a0373 Merge pull request #162 from ESMCI/fischer/python3 d4f1b1e8d Change shebang lines to python3 2fd941abc Merge pull request #158 from billsacks/modified_solution de08dc2ee Add another option for when an external is in a modified state e954582d0 Merge pull request #156 from billsacks/onbranch_show_hash 952e44d51 Change output: put tag/hash before branch name 10288430f Fix pre-existing pylint issues 01b13f78f When on a branch, show tag/hash, too 39ad53263 Merge pull request #150 from gold2718/fix_combo_config 75f8f02f5 Merge pull request #152 from jedwards4b/sort_by_local_path 42687bd53 remove commented code 29e26af81 fix pylint issues 7c9f3c613 add a test for nested repo checkout 75c5353d2 fix spacing 24a3726a1 improve sorting, checkout externals with each comp 29f45b086 remove py2 test and fix super call 880a4e765 remove decode 1c53be854 no need for set call 36c56dbac simplier fix for issue dc67cc682 simpler solution b32c6fca9 fix to allow submodule name different from path 5b5e1c2b0 Merge pull request #144 from billsacks/improve_errmsg c983863c4 Add another option for dealing with modified externals 59ce252cf Add some details to the error message when externals are modified be5a1a4d7 Merge pull request #143 from jedwards4b/add_exclude 2aa014a1b fix lint issue 49cd5e890 fix lint issues 418173ffd Added tests for ExternalsDescriptionDict afab352c8 fix lint issue be85b7d1b fix the test a580a570b push test d43710864 add a test 21affe33c fix formatting issue 72e6b64ae add an exclude option git-subtree-dir: manage_externals git-subtree-split: 0f884bfec8e43d0c02261de858d6ec3f6d855e51
correct mismatch of leap year ### Description of changes Handle a number of special cases in matching inputdata dates to model dates. These cases are: - Model is no_leap, data is Gregorian and leapyear date 2/29 is encountered in data - skip date - Model is Gregorian, data is no_leap and leapyear date 2/29 is encountered in model - repeat 2/28 data - Model is Gregorian, data is gregorian but leapyears do not align. - if in model leap year repeat data from 2/28 - if in data leap year skip date 2/29 ### Specific notes Contributors other than yourself, if any: @mvertens CDEPS Issues Fixed (include github issue #): ESCOMP#190 Are there dependencies on other component PRs (if so list): ESCOMP/CESM_share#35 Are changes expected to change answers (bfb, different to roundoff, more substantial): bfb Any User Interface Changes (namelist or namelist defaults changes): Testing performed (e.g. aux_cdeps, CESM prealpha, etc): Neon spinup of over 100 years Hashes used for testing: sM ./ccs_config modified sandbox, ccs_config_cesm0.0.44 (branch main) --> ccs_config_cesm0.0.38 ./cime clean sandbox, on cime6.0.45 s ./components/cdeps clean sandbox, 0f3f707 (branch leap_year_corrections) --> cdeps0.12.63 ./components/cdeps/fox clean sandbox, on 4.1.2.1 ./components/cdeps/share/genf90 clean sandbox, on genf90_200608 ./components/cism clean sandbox, on cismwrap_2_1_95 ./components/cism/source_cism clean sandbox, on cism_main_2.01.011 M ./components/cmeps modified sandbox, on cmeps0.13.71 ./components/cpl7 clean sandbox, on cpl7.0.14 ./components/mizuRoute clean sandbox, on 34723c2e4df7caa16812770f8d53ebc83fa22360 ./components/mosart clean sandbox, on mosart1_0_45 ./components/rtm clean sandbox, on rtm1_0_78 e-o ./doc/doc-builder -, not checked out --> v1.0.8 ./libraries/mct clean sandbox, on MCT_2.11.0 ./libraries/parallelio clean sandbox, on pio2_5_7 s ./share clean sandbox, bfa2b5d0a9de06153f2ac94a95818568a1f5cf11 (branch shr_cal_leapyear) --> share1.0.12 ./src/fates clean sandbox, on sci.1.58.1_api.24.1.0
NOTE: This PR was originally created in the temporary CTSM repository by @martynpclark, Sep 6, 2017, where it was NCAR/clm-ctsm#12. I am moving over most of the comments from there: both my own and those of @martynpclark .
Original comment from @martynpclark Sep 6, 2017
NOTE: This PR has not been compiled/tested. It is included to illustrate concepts for alternative numerical solutions, for discussion at the CTSM meeting on 7 Sep 2017.