{"action":"created","comment":{"url":"https://api.github.com/repos/NREL/EnergyPlus/pulls/comments/132448614","pull_request_review_id":55529500,"id":132448614,"diff_hunk":"@@ -482,11 +485,67 @@ namespace EconomicTariff {\n \t\t\t\ttariff( iInObj ).energyConv = 9.4781712e-9;\n \t\t\t\ttariff( iInObj ).demandConv = 0.00003412;\n \t\t\t} else {\n-\t\t\t\ttariff( iInObj ).convChoice = conversionKWH;\n-\t\t\t\ttariff( iInObj ).energyConv = 0.0000002778;\n-\t\t\t\ttariff( iInObj ).demandConv = 0.001;\n-\t\t\t\tShowWarningError( RoutineName + CurrentModuleObject + \"=\\\"\" + cAlphaArgs( 1 ) + \"\\\" invalid data\" );\n-\t\t\t\tShowContinueError( cAlphaFieldNames( 3 ) + \"=\\\"\" + cAlphaArgs( 3 ) + \"\\\", Defaulting to KWH.\" );\n+\n+\n+\t\t\t\t// TODO: is this needed?\n+\t\t\t\t// Assume it's not a water meter (already handled in the constructor, since set to 0)\n+\t\t\t\ttariff( iInObj ).kindWaterMtr = kindMeterNotWater;\n+\n+\t\t\t\t//determine if this is meter related to electricity, or water\n+\t\t\t\tif ( tariff( iInObj ).reportMeterIndx != 0 ) {\n+\t\t\t\t\t{ auto const SELECT_CASE_var( MakeUPPERCase( EnergyMeters( tariff( iInObj ).reportMeterIndx ).ResourceType ) );\n+\n+\t\t\t\t\t// TODO: wouldn't it be better to check whether it's electric here rather than in SelectTariff?\n+\t\t\t\t\t// For now, only check water\n+\t\t\t\t\tif  ( SELECT_CASE_var == \"WATER\" || SELECT_CASE_var == \"H2O\" || SELECT_CASE_var == \"ONSITEWATER\"\n+\t\t\t\t\t\t  || SELECT_CASE_var == \"WATERPRODUCED\" || SELECT_CASE_var == \"ONSITE WATER\" || SELECT_CASE_var == \"MAINSWATER\"\n+\t\t\t\t\t\t  || SELECT_CASE_var == \"WATERSUPPLY\" || SELECT_CASE_var == \"RAINWATER\" || SELECT_CASE_var == \"PRECIPITATION\"\n+\t\t\t\t\t\t  || SELECT_CASE_var == \"WELLWATER\" || SELECT_CASE_var == \"GROUNDWATER\" || SELECT_CASE_var == \"CONDENSATE\" ) {\n+\t\t\t\t\t\ttariff( iInObj ).kindWaterMtr = kindMeterWater;\n+\t\t\t\t\t} }\n+\t\t\t\t}\n+\n+\n+\t\t\t\t\t/**if ( SELECT_CASE_var == \"ELECTRICITY\" ) {\n+\t\t\t\t\t\ttariff( iTariff ).kindElectricMtr = kindMeterElecSimple;\n+\t\t\t\t\t} else if ( SELECT_CASE_var == \"ELECTRICITYPRODUCED\" ) {\n+\t\t\t\t\t\ttariff( iTariff ).kindElectricMtr = kindMeterElecProduced;\n+\t\t\t\t\t} else if ( SELECT_CASE_var == \"ELECTRICITYPURCHASED\" ) {\n+\t\t\t\t\t\ttariff( iTariff ).kindElectricMtr = kindMeterElecPurchased;\n+\t\t\t\t\t} else if ( SELECT_CASE_var == \"ELECTRICITYSURPLUSSOLD\" ) {\n+\t\t\t\t\t\ttariff( iTariff ).kindElectricMtr = kindMeterElecSurplusSold;\n+\t\t\t\t\t} else if ( SELECT_CASE_var == \"ELECTRICITYNET\" ) {\n+\t\t\t\t\t\ttariff( iTariff ).kindElectricMtr = kindMeterElecNet;\n+\t\t\t\t\t} else {\n+\t\t\t\t\t\ttariff( iTariff ).kindElectricMtr = kindMeterNotElectric;\n+\t\t\t\t\t\t// Handle the case where its a water meter\n+\t\t\t\t\t\tif  ( SELECT_CASE_var == \"WATER\" || SELECT_CASE_var == \"H2O\" || SELECT_CASE_var == \"ONSITEWATER\"\n+\t\t\t\t\t\t\t  || SELECT_CASE_var == \"WATERPRODUCED\" || SELECT_CASE_var == \"ONSITE WATER\" || SELECT_CASE_var == \"MAINSWATER\"\n+\t\t\t\t\t\t\t  || SELECT_CASE_var == \"WATERSUPPLY\" || SELECT_CASE_var == \"RAINWATER\" || SELECT_CASE_var == \"PRECIPITATION\"\n+\t\t\t\t\t\t\t  || SELECT_CASE_var == \"WELLWATER\" || SELECT_CASE_var == \"GROUNDWATER\" || SELECT_CASE_var == \"CONDENSATE\" ) {\n+\t\t\t\t\t\t\ttariff( iTariff ).kindWaterMtr = kindMeterWater;\n+\t\t\t\t\t\t}\n+\t\t\t\t\t}}\n+\t\t\t\t} else {\n+\t\t\t\t\ttariff( iTariff ).kindElectricMtr = kindMeterNotElectric;\n+\t\t\t\t}**/\n+\n+\n+\t\t\t\t// If it's a water meter, default to m^3, otherwise will default to kWh\n+\t\t\t\tif ( tariff( iInObj ).kindWaterMtr == kindMeterWater ) {","path":"src/EnergyPlus/EconomicTariff.cc","position":66,"original_position":66,"commit_id":"46906cff53c57813078c76ed064d29231ddb9d27","original_commit_id":"46906cff53c57813078c76ed064d29231ddb9d27","user":{"login":"jmarrec","id":5479063,"avatar_url":"https://avatars0.githubusercontent.com/u/5479063?v=4","gravatar_id":"","url":"https://api.github.com/users/jmarrec","html_url":"https://github.com/jmarrec","followers_url":"https://api.github.com/users/jmarrec/followers","following_url":"https://api.github.com/users/jmarrec/following{/other_user}","gists_url":"https://api.github.com/users/jmarrec/gists{/gist_id}","starred_url":"https://api.github.com/users/jmarrec/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jmarrec/subscriptions","organizations_url":"https://api.github.com/users/jmarrec/orgs","repos_url":"https://api.github.com/users/jmarrec/repos","events_url":"https://api.github.com/users/jmarrec/events{/privacy}","received_events_url":"https://api.github.com/users/jmarrec/received_events","type":"User","site_admin":false},"body":"Just to be clear, you're saying to remove the ShowWarning? I just copied the pattern I've seen where it does tell you that it defaulted to kWh. Seems like a valid information I'd like to have (and if I don't like the warning I can modify the object to suppress it). My 2 cents.","created_at":"2017-08-10T13:14:42Z","updated_at":"2017-08-10T13:14:42Z","html_url":"https://github.com/NREL/EnergyPlus/pull/6169#discussion_r132448614","pull_request_url":"https://api.github.com/repos/NREL/EnergyPlus/pulls/6169","_links":{"self":{"href":"https://api.github.com/repos/NREL/EnergyPlus/pulls/comments/132448614"},"html":{"href":"https://github.com/NREL/EnergyPlus/pull/6169#discussion_r132448614"},"pull_request":{"href":"https://api.github.com/repos/NREL/EnergyPlus/pulls/6169"}}},"pull_request":{"url":"https://api.github.com/repos/NREL/EnergyPlus/pulls/6169","id":124897074,"html_url":"https://github.com/NREL/EnergyPlus/pull/6169","diff_url":"https://github.com/NREL/EnergyPlus/pull/6169.diff","patch_url":"https://github.com/NREL/EnergyPlus/pull/6169.patch","issue_url":"https://api.github.com/repos/NREL/EnergyPlus/issues/6169","number":6169,"state":"open","locked":false,"title":"Handle water utility cost tariffs","user":{"login":"jmarrec","id":5479063,"avatar_url":"https://avatars0.githubusercontent.com/u/5479063?v=4","gravatar_id":"","url":"https://api.github.com/users/jmarrec","html_url":"https://github.com/jmarrec","followers_url":"https://api.github.com/users/jmarrec/followers","following_url":"https://api.github.com/users/jmarrec/following{/other_user}","gists_url":"https://api.github.com/users/jmarrec/gists{/gist_id}","starred_url":"https://api.github.com/users/jmarrec/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jmarrec/subscriptions","organizations_url":"https://api.github.com/users/jmarrec/orgs","repos_url":"https://api.github.com/users/jmarrec/repos","events_url":"https://api.github.com/users/jmarrec/events{/privacy}","received_events_url":"https://api.github.com/users/jmarrec/received_events","type":"User","site_admin":false},"body":"Fixes #6168","created_at":"2017-06-09T15:47:22Z","updated_at":"2017-08-10T13:14:42Z","closed_at":null,"merged_at":null,"merge_commit_sha":"5fac9357ca451cb055407d7e4450b7f652b4de3c","assignee":null,"assignees":[],"requested_reviewers":[],"milestone":null,"commits_url":"https://api.github.com/repos/NREL/EnergyPlus/pulls/6169/commits","review_comments_url":"https://api.github.com/repos/NREL/EnergyPlus/pulls/6169/comments","review_comment_url":"https://api.github.com/repos/NREL/EnergyPlus/pulls/comments{/number}","comments_url":"https://api.github.com/repos/NREL/EnergyPlus/issues/6169/comments","statuses_url":"https://api.github.com/repos/NREL/EnergyPlus/statuses/46906cff53c57813078c76ed064d29231ddb9d27","head":{"label":"jmarrec:HandleWaterUtilityCostTariffs","ref":"HandleWaterUtilityCostTariffs","sha":"46906cff53c57813078c76ed064d29231ddb9d27","user":{"login":"jmarrec","id":5479063,"avatar_url":"https://avatars0.githubusercontent.com/u/5479063?v=4","gravatar_id":"","url":"https://api.github.com/users/jmarrec","html_url":"https://github.com/jmarrec","followers_url":"https://api.github.com/users/jmarrec/followers","following_url":"https://api.github.com/users/jmarrec/following{/other_user}","gists_url":"https://api.github.com/users/jmarrec/gists{/gist_id}","starred_url":"https://api.github.com/users/jmarrec/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jmarrec/subscriptions","organizations_url":"https://api.github.com/users/jmarrec/orgs","repos_url":"https://api.github.com/users/jmarrec/repos","events_url":"https://api.github.com/users/jmarrec/events{/privacy}","received_events_url":"https://api.github.com/users/jmarrec/received_events","type":"User","site_admin":false},"repo":{"id":33233341,"name":"EnergyPlus","full_name":"jmarrec/EnergyPlus","owner":{"login":"jmarrec","id":5479063,"avatar_url":"https://avatars0.githubusercontent.com/u/5479063?v=4","gravatar_id":"","url":"https://api.github.com/users/jmarrec","html_url":"https://github.com/jmarrec","followers_url":"https://api.github.com/users/jmarrec/followers","following_url":"https://api.github.com/users/jmarrec/following{/other_user}","gists_url":"https://api.github.com/users/jmarrec/gists{/gist_id}","starred_url":"https://api.github.com/users/jmarrec/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jmarrec/subscriptions","organizations_url":"https://api.github.com/users/jmarrec/orgs","repos_url":"https://api.github.com/users/jmarrec/repos","events_url":"https://api.github.com/users/jmarrec/events{/privacy}","received_events_url":"https://api.github.com/users/jmarrec/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/jmarrec/EnergyPlus","description":null,"fork":true,"url":"https://api.github.com/repos/jmarrec/EnergyPlus","forks_url":"https://api.github.com/repos/jmarrec/EnergyPlus/forks","keys_url":"https://api.github.com/repos/jmarrec/EnergyPlus/keys{/key_id}","collaborators_url":"https://api.github.com/repos/jmarrec/EnergyPlus/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/jmarrec/EnergyPlus/teams","hooks_url":"https://api.github.com/repos/jmarrec/EnergyPlus/hooks","issue_events_url":"https://api.github.com/repos/jmarrec/EnergyPlus/issues/events{/number}","events_url":"https://api.github.com/repos/jmarrec/EnergyPlus/events","assignees_url":"https://api.github.com/repos/jmarrec/EnergyPlus/assignees{/user}","branches_url":"https://api.github.com/repos/jmarrec/EnergyPlus/branches{/branch}","tags_url":"https://api.github.com/repos/jmarrec/EnergyPlus/tags","blobs_url":"https://api.github.com/repos/jmarrec/EnergyPlus/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/jmarrec/EnergyPlus/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/jmarrec/EnergyPlus/git/refs{/sha}","trees_url":"https://api.github.com/repos/jmarrec/EnergyPlus/git/trees{/sha}","statuses_url":"https://api.github.com/repos/jmarrec/EnergyPlus/statuses/{sha}","languages_url":"https://api.github.com/repos/jmarrec/EnergyPlus/languages","stargazers_url":"https://api.github.com/repos/jmarrec/EnergyPlus/stargazers","contributors_url":"https://api.github.com/repos/jmarrec/EnergyPlus/contributors","subscribers_url":"https://api.github.com/repos/jmarrec/EnergyPlus/subscribers","subscription_url":"https://api.github.com/repos/jmarrec/EnergyPlus/subscription","commits_url":"https://api.github.com/repos/jmarrec/EnergyPlus/commits{/sha}","git_commits_url":"https://api.github.com/repos/jmarrec/EnergyPlus/git/commits{/sha}","comments_url":"https://api.github.com/repos/jmarrec/EnergyPlus/comments{/number}","issue_comment_url":"https://api.github.com/repos/jmarrec/EnergyPlus/issues/comments{/number}","contents_url":"https://api.github.com/repos/jmarrec/EnergyPlus/contents/{+path}","compare_url":"https://api.github.com/repos/jmarrec/EnergyPlus/compare/{base}...{head}","merges_url":"https://api.github.com/repos/jmarrec/EnergyPlus/merges","archive_url":"https://api.github.com/repos/jmarrec/EnergyPlus/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/jmarrec/EnergyPlus/downloads","issues_url":"https://api.github.com/repos/jmarrec/EnergyPlus/issues{/number}","pulls_url":"https://api.github.com/repos/jmarrec/EnergyPlus/pulls{/number}","milestones_url":"https://api.github.com/repos/jmarrec/EnergyPlus/milestones{/number}","notifications_url":"https://api.github.com/repos/jmarrec/EnergyPlus/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/jmarrec/EnergyPlus/labels{/name}","releases_url":"https://api.github.com/repos/jmarrec/EnergyPlus/releases{/id}","deployments_url":"https://api.github.com/repos/jmarrec/EnergyPlus/deployments","created_at":"2015-04-01T07:34:14Z","updated_at":"2016-02-07T16:49:24Z","pushed_at":"2017-07-25T08:54:38Z","git_url":"git://github.com/jmarrec/EnergyPlus.git","ssh_url":"git@github.com:jmarrec/EnergyPlus.git","clone_url":"https://github.com/jmarrec/EnergyPlus.git","svn_url":"https://github.com/jmarrec/EnergyPlus","homepage":null,"size":291339,"stargazers_count":0,"watchers_count":0,"language":"C++","has_issues":false,"has_projects":true,"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":"develop"}},"base":{"label":"NREL:develop","ref":"develop","sha":"fa73d590331fc1852c4c9ad1b9502035dbff99a5","user":{"login":"NREL","id":1906800,"avatar_url":"https://avatars1.githubusercontent.com/u/1906800?v=4","gravatar_id":"","url":"https://api.github.com/users/NREL","html_url":"https://github.com/NREL","followers_url":"https://api.github.com/users/NREL/followers","following_url":"https://api.github.com/users/NREL/following{/other_user}","gists_url":"https://api.github.com/users/NREL/gists{/gist_id}","starred_url":"https://api.github.com/users/NREL/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/NREL/subscriptions","organizations_url":"https://api.github.com/users/NREL/orgs","repos_url":"https://api.github.com/users/NREL/repos","events_url":"https://api.github.com/users/NREL/events{/privacy}","received_events_url":"https://api.github.com/users/NREL/received_events","type":"Organization","site_admin":false},"repo":{"id":14620185,"name":"EnergyPlus","full_name":"NREL/EnergyPlus","owner":{"login":"NREL","id":1906800,"avatar_url":"https://avatars1.githubusercontent.com/u/1906800?v=4","gravatar_id":"","url":"https://api.github.com/users/NREL","html_url":"https://github.com/NREL","followers_url":"https://api.github.com/users/NREL/followers","following_url":"https://api.github.com/users/NREL/following{/other_user}","gists_url":"https://api.github.com/users/NREL/gists{/gist_id}","starred_url":"https://api.github.com/users/NREL/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/NREL/subscriptions","organizations_url":"https://api.github.com/users/NREL/orgs","repos_url":"https://api.github.com/users/NREL/repos","events_url":"https://api.github.com/users/NREL/events{/privacy}","received_events_url":"https://api.github.com/users/NREL/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/NREL/EnergyPlus","description":"EnergyPlus™ is a whole building energy simulation program that engineers, architects, and researchers use to model both energy consumption and water use in buildings.","fork":false,"url":"https://api.github.com/repos/NREL/EnergyPlus","forks_url":"https://api.github.com/repos/NREL/EnergyPlus/forks","keys_url":"https://api.github.com/repos/NREL/EnergyPlus/keys{/key_id}","collaborators_url":"https://api.github.com/repos/NREL/EnergyPlus/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/NREL/EnergyPlus/teams","hooks_url":"https://api.github.com/repos/NREL/EnergyPlus/hooks","issue_events_url":"https://api.github.com/repos/NREL/EnergyPlus/issues/events{/number}","events_url":"https://api.github.com/repos/NREL/EnergyPlus/events","assignees_url":"https://api.github.com/repos/NREL/EnergyPlus/assignees{/user}","branches_url":"https://api.github.com/repos/NREL/EnergyPlus/branches{/branch}","tags_url":"https://api.github.com/repos/NREL/EnergyPlus/tags","blobs_url":"https://api.github.com/repos/NREL/EnergyPlus/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/NREL/EnergyPlus/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/NREL/EnergyPlus/git/refs{/sha}","trees_url":"https://api.github.com/repos/NREL/EnergyPlus/git/trees{/sha}","statuses_url":"https://api.github.com/repos/NREL/EnergyPlus/statuses/{sha}","languages_url":"https://api.github.com/repos/NREL/EnergyPlus/languages","stargazers_url":"https://api.github.com/repos/NREL/EnergyPlus/stargazers","contributors_url":"https://api.github.com/repos/NREL/EnergyPlus/contributors","subscribers_url":"https://api.github.com/repos/NREL/EnergyPlus/subscribers","subscription_url":"https://api.github.com/repos/NREL/EnergyPlus/subscription","commits_url":"https://api.github.com/repos/NREL/EnergyPlus/commits{/sha}","git_commits_url":"https://api.github.com/repos/NREL/EnergyPlus/git/commits{/sha}","comments_url":"https://api.github.com/repos/NREL/EnergyPlus/comments{/number}","issue_comment_url":"https://api.github.com/repos/NREL/EnergyPlus/issues/comments{/number}","contents_url":"https://api.github.com/repos/NREL/EnergyPlus/contents/{+path}","compare_url":"https://api.github.com/repos/NREL/EnergyPlus/compare/{base}...{head}","merges_url":"https://api.github.com/repos/NREL/EnergyPlus/merges","archive_url":"https://api.github.com/repos/NREL/EnergyPlus/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/NREL/EnergyPlus/downloads","issues_url":"https://api.github.com/repos/NREL/EnergyPlus/issues{/number}","pulls_url":"https://api.github.com/repos/NREL/EnergyPlus/pulls{/number}","milestones_url":"https://api.github.com/repos/NREL/EnergyPlus/milestones{/number}","notifications_url":"https://api.github.com/repos/NREL/EnergyPlus/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/NREL/EnergyPlus/labels{/name}","releases_url":"https://api.github.com/repos/NREL/EnergyPlus/releases{/id}","deployments_url":"https://api.github.com/repos/NREL/EnergyPlus/deployments","created_at":"2013-11-22T14:47:34Z","updated_at":"2017-07-03T17:36:46Z","pushed_at":"2017-08-09T21:43:54Z","git_url":"git://github.com/NREL/EnergyPlus.git","ssh_url":"git@github.com:NREL/EnergyPlus.git","clone_url":"https://github.com/NREL/EnergyPlus.git","svn_url":"https://github.com/NREL/EnergyPlus","homepage":"https://energyplus.net","size":322451,"stargazers_count":164,"watchers_count":164,"language":"C++","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":true,"forks_count":109,"mirror_url":null,"open_issues_count":487,"forks":109,"open_issues":487,"watchers":164,"default_branch":"develop"}},"_links":{"self":{"href":"https://api.github.com/repos/NREL/EnergyPlus/pulls/6169"},"html":{"href":"https://github.com/NREL/EnergyPlus/pull/6169"},"issue":{"href":"https://api.github.com/repos/NREL/EnergyPlus/issues/6169"},"comments":{"href":"https://api.github.com/repos/NREL/EnergyPlus/issues/6169/comments"},"review_comments":{"href":"https://api.github.com/repos/NREL/EnergyPlus/pulls/6169/comments"},"review_comment":{"href":"https://api.github.com/repos/NREL/EnergyPlus/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/NREL/EnergyPlus/pulls/6169/commits"},"statuses":{"href":"https://api.github.com/repos/NREL/EnergyPlus/statuses/46906cff53c57813078c76ed064d29231ddb9d27"}}}}
{"actor":{"display_login":"jmarrec"}}