{"action":"created","comment":{"url":"https://api.github.com/repos/geodynamics/aspect/pulls/comments/70423132","id":70423132,"diff_hunk":"@@ -1786,11 +1786,29 @@ namespace aspect\n \n           for (unsigned int c=0; c < parameters.n_compositional_fields; ++c)\n             {\n-              assemble_advection_system (AdvectionField::composition(c));\n-              solve_advection(AdvectionField::composition(c));\n-              if (parameters.use_discontinuous_composition_discretization\n-                  && parameters.use_limiter_for_discontinuous_composition_solution)\n-                apply_limiter_to_dg_solutions(AdvectionField::composition(c));\n+              const AdvectionField adv_field (AdvectionField::composition(c));\n+              typename Introspection<dim>::FieldMethod::kind method = adv_field.method(introspection);\n+              switch (method)\n+                {\n+                  case Introspection<dim>::FieldMethod::continuous_fem_field:\n+                    assemble_advection_system (adv_field);\n+                    solve_advection(adv_field);\n+                    break;\n+\n+                  case Introspection<dim>::FieldMethod::discontinuous_fem_field:\n+                    assemble_advection_system (adv_field);\n+                    solve_advection(adv_field);\n+                    if (parameters.use_limiter_for_discontinuous_composition_solution)\n+                      apply_limiter_to_dg_solutions(adv_field);","path":"source/simulator/core.cc","position":22,"original_position":22,"commit_id":"798040202dbbc9d7e698bc0b23b22ea8a140537b","original_commit_id":"798040202dbbc9d7e698bc0b23b22ea8a140537b","user":{"login":"bangerth","id":7504421,"avatar_url":"https://avatars.githubusercontent.com/u/7504421?v=3","gravatar_id":"","url":"https://api.github.com/users/bangerth","html_url":"https://github.com/bangerth","followers_url":"https://api.github.com/users/bangerth/followers","following_url":"https://api.github.com/users/bangerth/following{/other_user}","gists_url":"https://api.github.com/users/bangerth/gists{/gist_id}","starred_url":"https://api.github.com/users/bangerth/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/bangerth/subscriptions","organizations_url":"https://api.github.com/users/bangerth/orgs","repos_url":"https://api.github.com/users/bangerth/repos","events_url":"https://api.github.com/users/bangerth/events{/privacy}","received_events_url":"https://api.github.com/users/bangerth/received_events","type":"User","site_admin":false},"body":"This conflicts with the changes made in #1109. Can you rebase?","created_at":"2016-07-12T11:49:22Z","updated_at":"2016-07-12T11:49:22Z","html_url":"https://github.com/geodynamics/aspect/pull/1007#discussion_r70423132","pull_request_url":"https://api.github.com/repos/geodynamics/aspect/pulls/1007","_links":{"self":{"href":"https://api.github.com/repos/geodynamics/aspect/pulls/comments/70423132"},"html":{"href":"https://github.com/geodynamics/aspect/pull/1007#discussion_r70423132"},"pull_request":{"href":"https://api.github.com/repos/geodynamics/aspect/pulls/1007"}}},"pull_request":{"url":"https://api.github.com/repos/geodynamics/aspect/pulls/1007","id":75393904,"html_url":"https://github.com/geodynamics/aspect/pull/1007","diff_url":"https://github.com/geodynamics/aspect/pull/1007.diff","patch_url":"https://github.com/geodynamics/aspect/pull/1007.patch","issue_url":"https://api.github.com/repos/geodynamics/aspect/issues/1007","number":1007,"state":"open","locked":false,"title":"Tracer interpolation to field","user":{"login":"gassmoeller","id":7582930,"avatar_url":"https://avatars.githubusercontent.com/u/7582930?v=3","gravatar_id":"","url":"https://api.github.com/users/gassmoeller","html_url":"https://github.com/gassmoeller","followers_url":"https://api.github.com/users/gassmoeller/followers","following_url":"https://api.github.com/users/gassmoeller/following{/other_user}","gists_url":"https://api.github.com/users/gassmoeller/gists{/gist_id}","starred_url":"https://api.github.com/users/gassmoeller/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/gassmoeller/subscriptions","organizations_url":"https://api.github.com/users/gassmoeller/orgs","repos_url":"https://api.github.com/users/gassmoeller/repos","events_url":"https://api.github.com/users/gassmoeller/events{/privacy}","received_events_url":"https://api.github.com/users/gassmoeller/received_events","type":"User","site_admin":false},"body":"This is a preliminary implementation of how to consistently interpolate from particles to compositional fields. It contains bugs and is not in any shape for review, I just open the PR so that interested early adopters can look at it.","created_at":"2016-06-27T22:59:31Z","updated_at":"2016-07-12T11:49:22Z","closed_at":null,"merged_at":null,"merge_commit_sha":"8615c668ad34c99074b30305d85609fb100e07d2","assignee":null,"assignees":[],"milestone":null,"commits_url":"https://api.github.com/repos/geodynamics/aspect/pulls/1007/commits","review_comments_url":"https://api.github.com/repos/geodynamics/aspect/pulls/1007/comments","review_comment_url":"https://api.github.com/repos/geodynamics/aspect/pulls/comments{/number}","comments_url":"https://api.github.com/repos/geodynamics/aspect/issues/1007/comments","statuses_url":"https://api.github.com/repos/geodynamics/aspect/statuses/798040202dbbc9d7e698bc0b23b22ea8a140537b","head":{"label":"gassmoeller:tracer_interpolation_to_field","ref":"tracer_interpolation_to_field","sha":"798040202dbbc9d7e698bc0b23b22ea8a140537b","user":{"login":"gassmoeller","id":7582930,"avatar_url":"https://avatars.githubusercontent.com/u/7582930?v=3","gravatar_id":"","url":"https://api.github.com/users/gassmoeller","html_url":"https://github.com/gassmoeller","followers_url":"https://api.github.com/users/gassmoeller/followers","following_url":"https://api.github.com/users/gassmoeller/following{/other_user}","gists_url":"https://api.github.com/users/gassmoeller/gists{/gist_id}","starred_url":"https://api.github.com/users/gassmoeller/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/gassmoeller/subscriptions","organizations_url":"https://api.github.com/users/gassmoeller/orgs","repos_url":"https://api.github.com/users/gassmoeller/repos","events_url":"https://api.github.com/users/gassmoeller/events{/privacy}","received_events_url":"https://api.github.com/users/gassmoeller/received_events","type":"User","site_admin":false},"repo":{"id":19785507,"name":"aspect","full_name":"gassmoeller/aspect","owner":{"login":"gassmoeller","id":7582930,"avatar_url":"https://avatars.githubusercontent.com/u/7582930?v=3","gravatar_id":"","url":"https://api.github.com/users/gassmoeller","html_url":"https://github.com/gassmoeller","followers_url":"https://api.github.com/users/gassmoeller/followers","following_url":"https://api.github.com/users/gassmoeller/following{/other_user}","gists_url":"https://api.github.com/users/gassmoeller/gists{/gist_id}","starred_url":"https://api.github.com/users/gassmoeller/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/gassmoeller/subscriptions","organizations_url":"https://api.github.com/users/gassmoeller/orgs","repos_url":"https://api.github.com/users/gassmoeller/repos","events_url":"https://api.github.com/users/gassmoeller/events{/privacy}","received_events_url":"https://api.github.com/users/gassmoeller/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/gassmoeller/aspect","description":"Finite element parallel code to simulate problems in thermal convection in both 2D and 3D models.","fork":true,"url":"https://api.github.com/repos/gassmoeller/aspect","forks_url":"https://api.github.com/repos/gassmoeller/aspect/forks","keys_url":"https://api.github.com/repos/gassmoeller/aspect/keys{/key_id}","collaborators_url":"https://api.github.com/repos/gassmoeller/aspect/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/gassmoeller/aspect/teams","hooks_url":"https://api.github.com/repos/gassmoeller/aspect/hooks","issue_events_url":"https://api.github.com/repos/gassmoeller/aspect/issues/events{/number}","events_url":"https://api.github.com/repos/gassmoeller/aspect/events","assignees_url":"https://api.github.com/repos/gassmoeller/aspect/assignees{/user}","branches_url":"https://api.github.com/repos/gassmoeller/aspect/branches{/branch}","tags_url":"https://api.github.com/repos/gassmoeller/aspect/tags","blobs_url":"https://api.github.com/repos/gassmoeller/aspect/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/gassmoeller/aspect/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/gassmoeller/aspect/git/refs{/sha}","trees_url":"https://api.github.com/repos/gassmoeller/aspect/git/trees{/sha}","statuses_url":"https://api.github.com/repos/gassmoeller/aspect/statuses/{sha}","languages_url":"https://api.github.com/repos/gassmoeller/aspect/languages","stargazers_url":"https://api.github.com/repos/gassmoeller/aspect/stargazers","contributors_url":"https://api.github.com/repos/gassmoeller/aspect/contributors","subscribers_url":"https://api.github.com/repos/gassmoeller/aspect/subscribers","subscription_url":"https://api.github.com/repos/gassmoeller/aspect/subscription","commits_url":"https://api.github.com/repos/gassmoeller/aspect/commits{/sha}","git_commits_url":"https://api.github.com/repos/gassmoeller/aspect/git/commits{/sha}","comments_url":"https://api.github.com/repos/gassmoeller/aspect/comments{/number}","issue_comment_url":"https://api.github.com/repos/gassmoeller/aspect/issues/comments{/number}","contents_url":"https://api.github.com/repos/gassmoeller/aspect/contents/{+path}","compare_url":"https://api.github.com/repos/gassmoeller/aspect/compare/{base}...{head}","merges_url":"https://api.github.com/repos/gassmoeller/aspect/merges","archive_url":"https://api.github.com/repos/gassmoeller/aspect/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/gassmoeller/aspect/downloads","issues_url":"https://api.github.com/repos/gassmoeller/aspect/issues{/number}","pulls_url":"https://api.github.com/repos/gassmoeller/aspect/pulls{/number}","milestones_url":"https://api.github.com/repos/gassmoeller/aspect/milestones{/number}","notifications_url":"https://api.github.com/repos/gassmoeller/aspect/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/gassmoeller/aspect/labels{/name}","releases_url":"https://api.github.com/repos/gassmoeller/aspect/releases{/id}","deployments_url":"https://api.github.com/repos/gassmoeller/aspect/deployments","created_at":"2014-05-14T15:40:43Z","updated_at":"2016-06-30T17:24:00Z","pushed_at":"2016-07-02T05:00:41Z","git_url":"git://github.com/gassmoeller/aspect.git","ssh_url":"git@github.com:gassmoeller/aspect.git","clone_url":"https://github.com/gassmoeller/aspect.git","svn_url":"https://github.com/gassmoeller/aspect","homepage":null,"size":123973,"stargazers_count":2,"watchers_count":2,"language":"Gnuplot","has_issues":false,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":2,"mirror_url":null,"open_issues_count":0,"forks":2,"open_issues":0,"watchers":2,"default_branch":"master"}},"base":{"label":"geodynamics:master","ref":"master","sha":"eeef39f6b28430ac6be0e7f375496692c11af039","user":{"login":"geodynamics","id":4052461,"avatar_url":"https://avatars.githubusercontent.com/u/4052461?v=3","gravatar_id":"","url":"https://api.github.com/users/geodynamics","html_url":"https://github.com/geodynamics","followers_url":"https://api.github.com/users/geodynamics/followers","following_url":"https://api.github.com/users/geodynamics/following{/other_user}","gists_url":"https://api.github.com/users/geodynamics/gists{/gist_id}","starred_url":"https://api.github.com/users/geodynamics/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/geodynamics/subscriptions","organizations_url":"https://api.github.com/users/geodynamics/orgs","repos_url":"https://api.github.com/users/geodynamics/repos","events_url":"https://api.github.com/users/geodynamics/events{/privacy}","received_events_url":"https://api.github.com/users/geodynamics/received_events","type":"Organization","site_admin":false},"repo":{"id":19502452,"name":"aspect","full_name":"geodynamics/aspect","owner":{"login":"geodynamics","id":4052461,"avatar_url":"https://avatars.githubusercontent.com/u/4052461?v=3","gravatar_id":"","url":"https://api.github.com/users/geodynamics","html_url":"https://github.com/geodynamics","followers_url":"https://api.github.com/users/geodynamics/followers","following_url":"https://api.github.com/users/geodynamics/following{/other_user}","gists_url":"https://api.github.com/users/geodynamics/gists{/gist_id}","starred_url":"https://api.github.com/users/geodynamics/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/geodynamics/subscriptions","organizations_url":"https://api.github.com/users/geodynamics/orgs","repos_url":"https://api.github.com/users/geodynamics/repos","events_url":"https://api.github.com/users/geodynamics/events{/privacy}","received_events_url":"https://api.github.com/users/geodynamics/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/geodynamics/aspect","description":"A parallel, extendible finite element code to simulate thermal convection in both 2D and 3D models.","fork":false,"url":"https://api.github.com/repos/geodynamics/aspect","forks_url":"https://api.github.com/repos/geodynamics/aspect/forks","keys_url":"https://api.github.com/repos/geodynamics/aspect/keys{/key_id}","collaborators_url":"https://api.github.com/repos/geodynamics/aspect/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/geodynamics/aspect/teams","hooks_url":"https://api.github.com/repos/geodynamics/aspect/hooks","issue_events_url":"https://api.github.com/repos/geodynamics/aspect/issues/events{/number}","events_url":"https://api.github.com/repos/geodynamics/aspect/events","assignees_url":"https://api.github.com/repos/geodynamics/aspect/assignees{/user}","branches_url":"https://api.github.com/repos/geodynamics/aspect/branches{/branch}","tags_url":"https://api.github.com/repos/geodynamics/aspect/tags","blobs_url":"https://api.github.com/repos/geodynamics/aspect/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/geodynamics/aspect/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/geodynamics/aspect/git/refs{/sha}","trees_url":"https://api.github.com/repos/geodynamics/aspect/git/trees{/sha}","statuses_url":"https://api.github.com/repos/geodynamics/aspect/statuses/{sha}","languages_url":"https://api.github.com/repos/geodynamics/aspect/languages","stargazers_url":"https://api.github.com/repos/geodynamics/aspect/stargazers","contributors_url":"https://api.github.com/repos/geodynamics/aspect/contributors","subscribers_url":"https://api.github.com/repos/geodynamics/aspect/subscribers","subscription_url":"https://api.github.com/repos/geodynamics/aspect/subscription","commits_url":"https://api.github.com/repos/geodynamics/aspect/commits{/sha}","git_commits_url":"https://api.github.com/repos/geodynamics/aspect/git/commits{/sha}","comments_url":"https://api.github.com/repos/geodynamics/aspect/comments{/number}","issue_comment_url":"https://api.github.com/repos/geodynamics/aspect/issues/comments{/number}","contents_url":"https://api.github.com/repos/geodynamics/aspect/contents/{+path}","compare_url":"https://api.github.com/repos/geodynamics/aspect/compare/{base}...{head}","merges_url":"https://api.github.com/repos/geodynamics/aspect/merges","archive_url":"https://api.github.com/repos/geodynamics/aspect/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/geodynamics/aspect/downloads","issues_url":"https://api.github.com/repos/geodynamics/aspect/issues{/number}","pulls_url":"https://api.github.com/repos/geodynamics/aspect/pulls{/number}","milestones_url":"https://api.github.com/repos/geodynamics/aspect/milestones{/number}","notifications_url":"https://api.github.com/repos/geodynamics/aspect/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/geodynamics/aspect/labels{/name}","releases_url":"https://api.github.com/repos/geodynamics/aspect/releases{/id}","deployments_url":"https://api.github.com/repos/geodynamics/aspect/deployments","created_at":"2014-05-06T16:47:18Z","updated_at":"2016-06-28T02:05:15Z","pushed_at":"2016-07-12T11:48:42Z","git_url":"git://github.com/geodynamics/aspect.git","ssh_url":"git@github.com:geodynamics/aspect.git","clone_url":"https://github.com/geodynamics/aspect.git","svn_url":"https://github.com/geodynamics/aspect","homepage":"http://aspect.dealii.org/","size":147094,"stargazers_count":27,"watchers_count":27,"language":"Gnuplot","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":true,"forks_count":60,"mirror_url":null,"open_issues_count":141,"forks":60,"open_issues":141,"watchers":27,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/geodynamics/aspect/pulls/1007"},"html":{"href":"https://github.com/geodynamics/aspect/pull/1007"},"issue":{"href":"https://api.github.com/repos/geodynamics/aspect/issues/1007"},"comments":{"href":"https://api.github.com/repos/geodynamics/aspect/issues/1007/comments"},"review_comments":{"href":"https://api.github.com/repos/geodynamics/aspect/pulls/1007/comments"},"review_comment":{"href":"https://api.github.com/repos/geodynamics/aspect/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/geodynamics/aspect/pulls/1007/commits"},"statuses":{"href":"https://api.github.com/repos/geodynamics/aspect/statuses/798040202dbbc9d7e698bc0b23b22ea8a140537b"}}}}
{"actor":{"display_login":"bangerth"}}