@@ -467,7 +467,9 @@ def _create_cooling_parameters(
467467 con2 = processed_data ["con2" ]
468468
469469 results = {}
470-
470+ commodity_water_inp = (
471+ "surfacewater" if context .nexus_set == "nexus" else "freshwater"
472+ )
471473 # Create input parameters
472474 # Electricity inputs for parasitic demand
473475 inp = make_df (
@@ -498,7 +500,7 @@ def _create_cooling_parameters(
498500 year_act = icmse_df ["year_act" ],
499501 mode = icmse_df ["mode" ],
500502 node_origin = icmse_df ["node_origin" ],
501- commodity = "surfacewater" ,
503+ commodity = commodity_water_inp ,
502504 level = "water_supply" ,
503505 time = "year" ,
504506 time_origin = "year" ,
@@ -1336,13 +1338,16 @@ def non_cooling_tec(context: "Context", scenario=None) -> dict[str, pd.DataFrame
13361338 # Input dataframe for non cooling technologies
13371339 # only water withdrawals are being taken
13381340 # Dedicated freshwater is assumed for simplicity
1341+ commodity_water_inp = (
1342+ "surfacewater" if context .nexus_set == "nexus" else "freshwater"
1343+ )
13391344 inp_n_cool = make_df (
13401345 "input" ,
13411346 technology = n_cool_df_merge ["technology" ],
13421347 value = n_cool_df_merge ["value_y" ],
13431348 unit = "MCM/GWa" ,
13441349 level = "water_supply" ,
1345- commodity = "surfacewater" ,
1350+ commodity = commodity_water_inp ,
13461351 time_origin = "year" ,
13471352 mode = "M1" ,
13481353 time = "year" ,
0 commit comments