Files changed in integration branch AFTER we branched DSR

[bpbond]

Email from @pralitp

Generally doesn’t look like much work.

Pre 4.4 changes:
From a high level:
Updating LDS output to fix “amazon GLU mapping” issue
Fix GLU names for L181_yieldmult in L2252.land_input_5
bugfix: include irrigation in yield lookup in order to differentiate irr/rfd yields

The actual files changed:
aglu-data/LDS/LDS_ag_HA_ha.csv
aglu-data/LDS/LDS_ag_prod_t.csv
aglu-data/LDS/LDS_value_milUSD.csv
aglu-data/LDS/Land_type_area_ha.csv
aglu-data/LDS/MIRCA_irrHA_ha.csv
aglu-data/LDS/MIRCA_rfdHA_ha.csv
aglu-data/LDS/Pot_veg_carbon_Mg_per_ha.csv
aglu-data/LDS/Water_footprint_m3.csv
aglu-data/mappings/LDS_ctry_GLU.csv
aglu-processing-code/level1/LB162.ag_prodchange_R_C_Y_GLU_irr.R:
@@ -122,8 +122,8 @@ L162.ag_HA_ha_ctry_crop_Ysy_irr <- repeat_and_add_vector( na.omit( L162.ag_HA_ha

#Match in multipliers (from CROSIT database), GCAM regions, and GCAM commodities
L162.ag_HA_ha_ctry_crop_Ysy_irr$Mult <- L162.ag_HA_ha_Rcrs_Ccrs_Ysy_GLU_irr$Mult[
-  match( vecpaste( L162.ag_HA_ha_ctry_crop_Ysy_irr[ c( crs_ID, Y ) ] ),
-         vecpaste( L162.ag_HA_ha_Rcrs_Ccrs_Ysy_GLU_irr[ c( crs_ID, Y ) ] ) ) ]
+  match( vecpaste( L162.ag_HA_ha_ctry_crop_Ysy_irr[ c( crs_ID, irr, Y ) ] ),
+         vecpaste( L162.ag_HA_ha_Rcrs_Ccrs_Ysy_GLU_irr[ c( crs_ID, irr, Y ) ] ) ) ]
L162.ag_HA_ha_ctry_crop_Ysy_irr <- na.omit( L162.ag_HA_ha_ctry_crop_Ysy_irr )
L162.ag_HA_ha_ctry_crop_Ysy_irr$GCAM_region_ID <- iso_GCAM_regID$GCAM_region_ID[
  match( L162.ag_HA_ha_ctry_crop_Ysy_irr$iso, iso_GCAM_regID$iso ) ]

aglu-processing-code/level2/L2252.land_input_5_irr_mgmt.R:
@@ -30,7 +30,7 @@ GCAM_region_names <- readdata( "COMMON_MAPPINGS", "GCAM_region_names" )
basin_to_country_mapping <- readdata( "WATER_MAPPINGS", "basin_to_country_mapping" )
L181.LandShare_R_bio_GLU_irr <- readdata( "AGLU_LEVEL1_DATA", "L181.LandShare_R_bio_GLU_irr", replace_GLU = T )
L181.LC_bm2_R_C_Yh_GLU_irr_level <- readdata( "AGLU_LEVEL1_DATA", "L181.LC_bm2_R_C_Yh_GLU_irr_level", replace_GLU = T )
-L181.YieldMult_R_bio_GLU_irr <- readdata( "AGLU_LEVEL1_DATA", "L181.YieldMult_R_bio_GLU_irr" )
+L181.YieldMult_R_bio_GLU_irr <- readdata( "AGLU_LEVEL1_DATA", "L181.YieldMult_R_bio_GLU_irr", replace_GLU = T  )
L2241.LN4_Logit <- readdata( "AGLU_LEVEL2_DATA", "L2241.LN4_Logit", skip = 4 )
L2241.LN4_HistMgdAllocation_crop <- readdata( "AGLU_LEVEL2_DATA", "L2241.LN4_HistMgdAllocation_crop", skip = 4 )
L2241.LN4_MgdAllocation_crop <- readdata( "AGLU_LEVEL2_DATA", "L2241.LN4_MgdAllocation_crop", skip = 4 )

Post 4.4:
From a high level:
Negative emissions budget constraints
Capacity factor now part of technology instead of in each input
Renewables capacity backup bug fix
Regional ag markets
Fix Industry Price elasticity
Fix managed carbon carbon content
Non-CO2 updates
Bug fix unit conversions for GCAM-USA wind

Actual files changes:
_common/assumptions/level2_data_names.R
_common/assumptions/unit_conversions.R
_common/headers/AGLU_header.R
_common/headers/ENERGY_header.R
_common/headers/ModelInterface_headers.txt
aglu-data/assumptions/A_aglu_assumptions.R
aglu-data/level0/FAO_USA_ag_an_P_USDt_PRICESTAT.csv
aglu-processing-code/level1/LB132.ag_an_For_Prices_USA_C_2005.R
aglu-processing-code/level1/LB133.ag_Costs_USA_C_2005.R
aglu-processing-code/level1/LB164.ag_Costs_USA_C_2005_irr.R
emissions-data/assumptions/A_emissions_data.R
emissions-processing-code/level2/L252.MACC.R
energy-data/assumptions/* (hard to say since Robert just changed line endings on all the files here)
energy-processing-code/level1/LA115.roofPV.R
energy-processing-code/level2/L210.resources.R
energy-processing-code/level2/L223.electricity.R
energy-processing-code/level2/L270.limits.R (new)
gcam-usa-data/GIS/us_state_wind.csv
gcam-usa-processing-code/leve1/LA114.Wind.R
gcam-usa-processing-code/leve1/LA119.Solar.R
gcam-usa-processing-code/leve2/L210.resources_USA.R
gcam-usa-processing-code/leve2/L223.electricity_USA.R
modeltime-data/assumptions/A_modeltime_data.R
water-processing-code/level2/L2233.electricity_water.R

[pralitp]

Closed by #876