{"action":"created","comment":{"url":"https://api.github.com/repos/NCAR/summa/pulls/comments/59153109","id":59153109,"diff_hunk":"@@ -612,14 +659,19 @@ program multi_driver\n  end do  ! (end looping through global HRUs)\n \n  ! print progress\n- if(globalPrintFlag)then\n-  if(timeStruct%var(iLookTIME%ih) >0) write(*,'(i4,1x,5(i2,1x))') timeStruct%var\n- endif\n+ select case(ixProgress)\n+  case(ixProgress_im);    printProgress = (timeStruct%var(iLookTIME%id)   == 1 .and. timeStruct%var(iLookTIME%ih)   == 0 .and. timeStruct%var(iLookTIME%imin) == 0)\n+  case(ixProgress_id);    printProgress = (timeStruct%var(iLookTIME%ih)   == 0 .and. timeStruct%var(iLookTIME%imin) == 0)\n+  case(ixProgress_ih);    printProgress = (timeStruct%var(iLookTIME%imin) == 0)\n+  case(ixProgress_never); printProgress = .false.\n+  case default; call handle_err(20,'unable to identify option for the restart file')\n+ end select\n+ if(printProgress) write(*,'(i4,1x,5(i2,1x))') timeStruct%var\n \n  ! NOTE: this is done because of the check in coupled_em if computeVegFlux changes in subsequent time steps\n  !  (if computeVegFlux changes, then the number of state variables changes, and we need to reoranize the data structures)\n  ! compute the exposed LAI and SAI and whether veg is buried by snow\n- if(istep==1)then  \n+ if(modelTimeStep==1)then  ","path":"build/source/driver/multi_driver.f90","position":244,"original_position":244,"commit_id":"7cb74433f052fec86081735acc115f5688b013d1","original_commit_id":"7cb74433f052fec86081735acc115f5688b013d1","user":{"login":"martynpclark","id":8038943,"avatar_url":"https://avatars.githubusercontent.com/u/8038943?v=3","gravatar_id":"","url":"https://api.github.com/users/martynpclark","html_url":"https://github.com/martynpclark","followers_url":"https://api.github.com/users/martynpclark/followers","following_url":"https://api.github.com/users/martynpclark/following{/other_user}","gists_url":"https://api.github.com/users/martynpclark/gists{/gist_id}","starred_url":"https://api.github.com/users/martynpclark/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/martynpclark/subscriptions","organizations_url":"https://api.github.com/users/martynpclark/orgs","repos_url":"https://api.github.com/users/martynpclark/repos","events_url":"https://api.github.com/users/martynpclark/events{/privacy}","received_events_url":"https://api.github.com/users/martynpclark/received_events","type":"User","site_admin":false},"body":"Nice. The naming convention of `modelTimeStep` etc. makes things very clear.","created_at":"2016-04-11T04:25:25Z","updated_at":"2016-04-11T04:25:25Z","html_url":"https://github.com/NCAR/summa/pull/139#discussion_r59153109","pull_request_url":"https://api.github.com/repos/NCAR/summa/pulls/139","_links":{"self":{"href":"https://api.github.com/repos/NCAR/summa/pulls/comments/59153109"},"html":{"href":"https://github.com/NCAR/summa/pull/139#discussion_r59153109"},"pull_request":{"href":"https://api.github.com/repos/NCAR/summa/pulls/139"}}},"pull_request":{"url":"https://api.github.com/repos/NCAR/summa/pulls/139","id":65897165,"html_url":"https://github.com/NCAR/summa/pull/139","diff_url":"https://github.com/NCAR/summa/pull/139.diff","patch_url":"https://github.com/NCAR/summa/pull/139.patch","issue_url":"https://api.github.com/repos/NCAR/summa/issues/139","number":139,"state":"open","locked":false,"title":"Feature/merge refactor","user":{"login":"greyNearing","id":17014654,"avatar_url":"https://avatars.githubusercontent.com/u/17014654?v=3","gravatar_id":"","url":"https://api.github.com/users/greyNearing","html_url":"https://github.com/greyNearing","followers_url":"https://api.github.com/users/greyNearing/followers","following_url":"https://api.github.com/users/greyNearing/following{/other_user}","gists_url":"https://api.github.com/users/greyNearing/gists{/gist_id}","starred_url":"https://api.github.com/users/greyNearing/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/greyNearing/subscriptions","organizations_url":"https://api.github.com/users/greyNearing/orgs","repos_url":"https://api.github.com/users/greyNearing/repos","events_url":"https://api.github.com/users/greyNearing/events{/privacy}","received_events_url":"https://api.github.com/users/greyNearing/received_events","type":"User","site_admin":false},"body":"This PR follows martynpclark's # 137. It has been merged, resolved, and tested with that branch.\r\n\r\nChanges allow for multiple output streams at different frequencies.\r\nEach variable may be output at exactly one frequency (specified in terms of the number of model time steps), but the user may request any number of several output statistics over that time period.\r\n\r\nFor example, if we want soil moisture output daily from a model run at an hourly time step, this has an output frequency of 24, and we may request the daily:\r\n1. average\r\n2. max/min\r\n3. variance (maximum likelihood estimator, not unbiased estimator).\r\n4. total (for things like fluxes that can be summed)\r\n5. or the instantaneous value at the particular output time step.\r\n\r\nThere may be a maximum of 10 different output streams, however this maximum number can be changed in line 30 of source/dshare/var_lookup.f90\r\n\r\nThis all requires a new input file that allows the user to request different variables in different output streams. This new file is pointed to in the file manager file - it replaces the old META_LOCALMVAR file, which was not used any longer. An example model output control file is located in the build/ directory in this PR.\r\n\r\nThis branch has been tested on all of the testcases that are currently running with netcdf input (all except figures 5 and 9 from the wrr testcase directory).  It has been checked with output timings at 1 (every model timestep) and 24 (once per day) on all outputs from the testcases - this includes outputs of every time. It provides answers within machine precision.","created_at":"2016-04-10T00:43:45Z","updated_at":"2016-04-11T04:25:25Z","closed_at":null,"merged_at":null,"merge_commit_sha":"ab19aba83c3cb5f2114e55733c04b9d622c74928","assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/NCAR/summa/pulls/139/commits","review_comments_url":"https://api.github.com/repos/NCAR/summa/pulls/139/comments","review_comment_url":"https://api.github.com/repos/NCAR/summa/pulls/comments{/number}","comments_url":"https://api.github.com/repos/NCAR/summa/issues/139/comments","statuses_url":"https://api.github.com/repos/NCAR/summa/statuses/7cb74433f052fec86081735acc115f5688b013d1","head":{"label":"greyNearing:feature/mergeRefactor","ref":"feature/mergeRefactor","sha":"7cb74433f052fec86081735acc115f5688b013d1","user":{"login":"greyNearing","id":17014654,"avatar_url":"https://avatars.githubusercontent.com/u/17014654?v=3","gravatar_id":"","url":"https://api.github.com/users/greyNearing","html_url":"https://github.com/greyNearing","followers_url":"https://api.github.com/users/greyNearing/followers","following_url":"https://api.github.com/users/greyNearing/following{/other_user}","gists_url":"https://api.github.com/users/greyNearing/gists{/gist_id}","starred_url":"https://api.github.com/users/greyNearing/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/greyNearing/subscriptions","organizations_url":"https://api.github.com/users/greyNearing/orgs","repos_url":"https://api.github.com/users/greyNearing/repos","events_url":"https://api.github.com/users/greyNearing/events{/privacy}","received_events_url":"https://api.github.com/users/greyNearing/received_events","type":"User","site_admin":false},"repo":{"id":50875620,"name":"summa","full_name":"greyNearing/summa","owner":{"login":"greyNearing","id":17014654,"avatar_url":"https://avatars.githubusercontent.com/u/17014654?v=3","gravatar_id":"","url":"https://api.github.com/users/greyNearing","html_url":"https://github.com/greyNearing","followers_url":"https://api.github.com/users/greyNearing/followers","following_url":"https://api.github.com/users/greyNearing/following{/other_user}","gists_url":"https://api.github.com/users/greyNearing/gists{/gist_id}","starred_url":"https://api.github.com/users/greyNearing/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/greyNearing/subscriptions","organizations_url":"https://api.github.com/users/greyNearing/orgs","repos_url":"https://api.github.com/users/greyNearing/repos","events_url":"https://api.github.com/users/greyNearing/events{/privacy}","received_events_url":"https://api.github.com/users/greyNearing/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/greyNearing/summa","description":"Structure for Unifying Multiple Modeling Alternatives:","fork":true,"url":"https://api.github.com/repos/greyNearing/summa","forks_url":"https://api.github.com/repos/greyNearing/summa/forks","keys_url":"https://api.github.com/repos/greyNearing/summa/keys{/key_id}","collaborators_url":"https://api.github.com/repos/greyNearing/summa/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/greyNearing/summa/teams","hooks_url":"https://api.github.com/repos/greyNearing/summa/hooks","issue_events_url":"https://api.github.com/repos/greyNearing/summa/issues/events{/number}","events_url":"https://api.github.com/repos/greyNearing/summa/events","assignees_url":"https://api.github.com/repos/greyNearing/summa/assignees{/user}","branches_url":"https://api.github.com/repos/greyNearing/summa/branches{/branch}","tags_url":"https://api.github.com/repos/greyNearing/summa/tags","blobs_url":"https://api.github.com/repos/greyNearing/summa/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/greyNearing/summa/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/greyNearing/summa/git/refs{/sha}","trees_url":"https://api.github.com/repos/greyNearing/summa/git/trees{/sha}","statuses_url":"https://api.github.com/repos/greyNearing/summa/statuses/{sha}","languages_url":"https://api.github.com/repos/greyNearing/summa/languages","stargazers_url":"https://api.github.com/repos/greyNearing/summa/stargazers","contributors_url":"https://api.github.com/repos/greyNearing/summa/contributors","subscribers_url":"https://api.github.com/repos/greyNearing/summa/subscribers","subscription_url":"https://api.github.com/repos/greyNearing/summa/subscription","commits_url":"https://api.github.com/repos/greyNearing/summa/commits{/sha}","git_commits_url":"https://api.github.com/repos/greyNearing/summa/git/commits{/sha}","comments_url":"https://api.github.com/repos/greyNearing/summa/comments{/number}","issue_comment_url":"https://api.github.com/repos/greyNearing/summa/issues/comments{/number}","contents_url":"https://api.github.com/repos/greyNearing/summa/contents/{+path}","compare_url":"https://api.github.com/repos/greyNearing/summa/compare/{base}...{head}","merges_url":"https://api.github.com/repos/greyNearing/summa/merges","archive_url":"https://api.github.com/repos/greyNearing/summa/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/greyNearing/summa/downloads","issues_url":"https://api.github.com/repos/greyNearing/summa/issues{/number}","pulls_url":"https://api.github.com/repos/greyNearing/summa/pulls{/number}","milestones_url":"https://api.github.com/repos/greyNearing/summa/milestones{/number}","notifications_url":"https://api.github.com/repos/greyNearing/summa/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/greyNearing/summa/labels{/name}","releases_url":"https://api.github.com/repos/greyNearing/summa/releases{/id}","deployments_url":"https://api.github.com/repos/greyNearing/summa/deployments","created_at":"2016-02-01T22:18:51Z","updated_at":"2016-02-01T22:18:52Z","pushed_at":"2016-04-10T00:51:09Z","git_url":"git://github.com/greyNearing/summa.git","ssh_url":"git@github.com:greyNearing/summa.git","clone_url":"https://github.com/greyNearing/summa.git","svn_url":"https://github.com/greyNearing/summa","homepage":"http://www.ral.ucar.edu/projects/summa","size":24079,"stargazers_count":0,"watchers_count":0,"language":"FORTRAN","has_issues":false,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":0,"forks":0,"open_issues":0,"watchers":0,"default_branch":"master"}},"base":{"label":"NCAR:develop","ref":"develop","sha":"907c5416edfb4486df03dc6ac3c099dd8cc5f6c1","user":{"login":"NCAR","id":2007542,"avatar_url":"https://avatars.githubusercontent.com/u/2007542?v=3","gravatar_id":"","url":"https://api.github.com/users/NCAR","html_url":"https://github.com/NCAR","followers_url":"https://api.github.com/users/NCAR/followers","following_url":"https://api.github.com/users/NCAR/following{/other_user}","gists_url":"https://api.github.com/users/NCAR/gists{/gist_id}","starred_url":"https://api.github.com/users/NCAR/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/NCAR/subscriptions","organizations_url":"https://api.github.com/users/NCAR/orgs","repos_url":"https://api.github.com/users/NCAR/repos","events_url":"https://api.github.com/users/NCAR/events{/privacy}","received_events_url":"https://api.github.com/users/NCAR/received_events","type":"Organization","site_admin":false},"repo":{"id":21404710,"name":"summa","full_name":"NCAR/summa","owner":{"login":"NCAR","id":2007542,"avatar_url":"https://avatars.githubusercontent.com/u/2007542?v=3","gravatar_id":"","url":"https://api.github.com/users/NCAR","html_url":"https://github.com/NCAR","followers_url":"https://api.github.com/users/NCAR/followers","following_url":"https://api.github.com/users/NCAR/following{/other_user}","gists_url":"https://api.github.com/users/NCAR/gists{/gist_id}","starred_url":"https://api.github.com/users/NCAR/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/NCAR/subscriptions","organizations_url":"https://api.github.com/users/NCAR/orgs","repos_url":"https://api.github.com/users/NCAR/repos","events_url":"https://api.github.com/users/NCAR/events{/privacy}","received_events_url":"https://api.github.com/users/NCAR/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/NCAR/summa","description":"Structure for Unifying Multiple Modeling Alternatives:","fork":false,"url":"https://api.github.com/repos/NCAR/summa","forks_url":"https://api.github.com/repos/NCAR/summa/forks","keys_url":"https://api.github.com/repos/NCAR/summa/keys{/key_id}","collaborators_url":"https://api.github.com/repos/NCAR/summa/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/NCAR/summa/teams","hooks_url":"https://api.github.com/repos/NCAR/summa/hooks","issue_events_url":"https://api.github.com/repos/NCAR/summa/issues/events{/number}","events_url":"https://api.github.com/repos/NCAR/summa/events","assignees_url":"https://api.github.com/repos/NCAR/summa/assignees{/user}","branches_url":"https://api.github.com/repos/NCAR/summa/branches{/branch}","tags_url":"https://api.github.com/repos/NCAR/summa/tags","blobs_url":"https://api.github.com/repos/NCAR/summa/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/NCAR/summa/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/NCAR/summa/git/refs{/sha}","trees_url":"https://api.github.com/repos/NCAR/summa/git/trees{/sha}","statuses_url":"https://api.github.com/repos/NCAR/summa/statuses/{sha}","languages_url":"https://api.github.com/repos/NCAR/summa/languages","stargazers_url":"https://api.github.com/repos/NCAR/summa/stargazers","contributors_url":"https://api.github.com/repos/NCAR/summa/contributors","subscribers_url":"https://api.github.com/repos/NCAR/summa/subscribers","subscription_url":"https://api.github.com/repos/NCAR/summa/subscription","commits_url":"https://api.github.com/repos/NCAR/summa/commits{/sha}","git_commits_url":"https://api.github.com/repos/NCAR/summa/git/commits{/sha}","comments_url":"https://api.github.com/repos/NCAR/summa/comments{/number}","issue_comment_url":"https://api.github.com/repos/NCAR/summa/issues/comments{/number}","contents_url":"https://api.github.com/repos/NCAR/summa/contents/{+path}","compare_url":"https://api.github.com/repos/NCAR/summa/compare/{base}...{head}","merges_url":"https://api.github.com/repos/NCAR/summa/merges","archive_url":"https://api.github.com/repos/NCAR/summa/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/NCAR/summa/downloads","issues_url":"https://api.github.com/repos/NCAR/summa/issues{/number}","pulls_url":"https://api.github.com/repos/NCAR/summa/pulls{/number}","milestones_url":"https://api.github.com/repos/NCAR/summa/milestones{/number}","notifications_url":"https://api.github.com/repos/NCAR/summa/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/NCAR/summa/labels{/name}","releases_url":"https://api.github.com/repos/NCAR/summa/releases{/id}","deployments_url":"https://api.github.com/repos/NCAR/summa/deployments","created_at":"2014-07-01T22:58:27Z","updated_at":"2016-02-21T22:05:15Z","pushed_at":"2016-04-11T04:06:36Z","git_url":"git://github.com/NCAR/summa.git","ssh_url":"git@github.com:NCAR/summa.git","clone_url":"https://github.com/NCAR/summa.git","svn_url":"https://github.com/NCAR/summa","homepage":"http://www.ral.ucar.edu/projects/summa","size":23966,"stargazers_count":10,"watchers_count":10,"language":"FORTRAN","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":17,"mirror_url":null,"open_issues_count":45,"forks":17,"open_issues":45,"watchers":10,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/NCAR/summa/pulls/139"},"html":{"href":"https://github.com/NCAR/summa/pull/139"},"issue":{"href":"https://api.github.com/repos/NCAR/summa/issues/139"},"comments":{"href":"https://api.github.com/repos/NCAR/summa/issues/139/comments"},"review_comments":{"href":"https://api.github.com/repos/NCAR/summa/pulls/139/comments"},"review_comment":{"href":"https://api.github.com/repos/NCAR/summa/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/NCAR/summa/pulls/139/commits"},"statuses":{"href":"https://api.github.com/repos/NCAR/summa/statuses/7cb74433f052fec86081735acc115f5688b013d1"}}}}