diff --git a/constants_and_names.py b/constants_and_names.py index c6205327..6aa15d38 100644 --- a/constants_and_names.py +++ b/constants_and_names.py @@ -8,7 +8,7 @@ ######## ######## # Model version -version = '1.4.0' +version = '1.4.1' version_filename = version.replace('.', '_') @@ -332,11 +332,12 @@ plant_pre_2000_processed_dir = os.path.join(s3_base_dir, 'other_emissions_inputs/IDN_MYS_plantation_pre_2000/processed/20200724/') # Drivers of tree cover loss - -drivers_raw_dir = 's3://gfw2-data/drivers_of_loss/1_km/raw/20241121/' -pattern_drivers_raw = 'drivers_of_TCL_1_km_20241121.tif' -pattern_drivers = 'drivers_of_TCL_1_km_20241121' -drivers_processed_dir = 's3://gfw2-data/drivers_of_loss/1_km/processed/20241121/' +#Note: New drivers is a multi-band image woth the classification in Band 1 and probabilities for each class in the other bands +# Make sure to only use Band 1 when hansenizing the drivers tiles. +drivers_raw_dir = 's3://gfw2-data/drivers_of_loss/1_km/raw/update2023_20241218/' +pattern_drivers_raw = 'drivers_forest_loss_1km_2023_band1.tif' +pattern_drivers = 'drivers_of_TCL_1_km_20241224' +drivers_processed_dir = 's3://gfw2-data/drivers_of_loss/1_km/processed/20241224/' # Tree cover loss from fires TCLF_raw_dir = 's3://gfw2-data/forest_change/hansen_2023_fire/' @@ -647,7 +648,8 @@ ### Emissions from biomass and soil (all carbon emitted_pools) # Date to include in the output directory -emis_run_date_biomass_soil = '20241122' +emis_run_date_biomass_soil = '20241230' + pattern_gross_emis_all_gases_all_drivers_biomass_soil = f'gross_emis_all_gases_all_drivers_Mg_CO2e_ha_biomass_soil_2001_{loss_years}' gross_emis_all_gases_all_drivers_biomass_soil_dir = f'{s3_base_dir}gross_emissions/all_drivers/all_gases/biomass_soil/standard/full_extent/per_hectare/{emis_run_date_biomass_soil}/' @@ -672,7 +674,8 @@ ### Emissions from soil only # Date to include in the output directory -emis_run_date_soil_only = '20241122' +emis_run_date_soil_only = '20241230' + pattern_gross_emis_all_gases_all_drivers_soil_only = f'gross_emis_all_gases_all_drivers_Mg_CO2e_ha_soil_only_2001_{loss_years}' gross_emis_all_gases_all_drivers_soil_only_dir = f'{s3_base_dir}gross_emissions/all_drivers/all_gases/soil_only/standard/{emis_run_date_soil_only}/' @@ -697,11 +700,11 @@ # Net emissions for all forest types and all carbon emitted_pools in all pixels pattern_net_flux = f'net_flux_Mg_CO2e_ha_biomass_soil_2001_{loss_years}' -net_flux_dir = os.path.join(s3_base_dir, 'net_flux_all_forest_types_all_drivers/biomass_soil/standard/full_extent/per_hectare/20241122/') +net_flux_dir = os.path.join(s3_base_dir, 'net_flux_all_forest_types_all_drivers/biomass_soil/standard/full_extent/per_hectare/20241230/') # Net emissions for all forest types and all carbon emitted_pools in forest extent pattern_net_flux_forest_extent = f'net_flux_Mg_CO2e_ha_biomass_soil_forest_extent_2001_{loss_years}' -net_flux_forest_extent_dir = os.path.join(s3_base_dir, 'net_flux_all_forest_types_all_drivers/biomass_soil/standard/forest_extent/per_hectare/20241122/') +net_flux_forest_extent_dir = os.path.join(s3_base_dir, 'net_flux_all_forest_types_all_drivers/biomass_soil/standard/forest_extent/per_hectare/20241230/') ### Per pixel model outputs @@ -709,27 +712,27 @@ # Gross removals per pixel in all pixels pattern_cumul_gain_AGCO2_BGCO2_all_types_per_pixel_full_extent = f'gross_removals_AGCO2_BGCO2_Mg_pixel_all_forest_types_full_extent_2001_{loss_years}' -cumul_gain_AGCO2_BGCO2_all_types_per_pixel_full_extent_dir = os.path.join(s3_base_dir, 'gross_removals_AGCO2_BGCO2_all_forest_types/standard/full_extent/per_pixel/20241122/') +cumul_gain_AGCO2_BGCO2_all_types_per_pixel_full_extent_dir = os.path.join(s3_base_dir, 'gross_removals_AGCO2_BGCO2_all_forest_types/standard/full_extent/per_pixel/20241230/') # Gross removals per pixel in forest extent pattern_cumul_gain_AGCO2_BGCO2_all_types_per_pixel_forest_extent = f'gross_removals_AGCO2_BGCO2_Mg_pixel_all_forest_types_forest_extent_2001_{loss_years}' -cumul_gain_AGCO2_BGCO2_all_types_per_pixel_forest_extent_dir = os.path.join(s3_base_dir, 'gross_removals_AGCO2_BGCO2_all_forest_types/standard/forest_extent/per_pixel/20241122/') +cumul_gain_AGCO2_BGCO2_all_types_per_pixel_forest_extent_dir = os.path.join(s3_base_dir, 'gross_removals_AGCO2_BGCO2_all_forest_types/standard/forest_extent/per_pixel/20241230/') # Gross emissions per pixel in all pixels pattern_gross_emis_all_gases_all_drivers_biomass_soil_per_pixel_full_extent = f'gross_emis_all_gases_all_drivers_Mg_CO2e_pixel_biomass_soil_full_extent_2001_{loss_years}' -gross_emis_all_gases_all_drivers_biomass_soil_per_pixel_full_extent_dir = os.path.join(s3_base_dir, 'gross_emissions/all_drivers/all_gases/biomass_soil/standard/full_extent/per_pixel/20241122/') +gross_emis_all_gases_all_drivers_biomass_soil_per_pixel_full_extent_dir = os.path.join(s3_base_dir, 'gross_emissions/all_drivers/all_gases/biomass_soil/standard/full_extent/per_pixel/20241230/') # Gross emissions per pixel in forest extent pattern_gross_emis_all_gases_all_drivers_biomass_soil_per_pixel_forest_extent = f'gross_emis_all_gases_all_drivers_Mg_CO2e_pixel_biomass_soil_forest_extent_2001_{loss_years}' -gross_emis_all_gases_all_drivers_biomass_soil_per_pixel_forest_extent_dir = os.path.join(s3_base_dir, 'gross_emissions/all_drivers/all_gases/biomass_soil/standard/forest_extent/per_pixel/20241122/') +gross_emis_all_gases_all_drivers_biomass_soil_per_pixel_forest_extent_dir = os.path.join(s3_base_dir, 'gross_emissions/all_drivers/all_gases/biomass_soil/standard/forest_extent/per_pixel/20241230/') # Net flux per pixel in all pixels pattern_net_flux_per_pixel_full_extent = f'net_flux_Mg_CO2e_pixel_biomass_soil_full_extent_2001_{loss_years}' -net_flux_per_pixel_full_extent_dir = os.path.join(s3_base_dir, 'net_flux_all_forest_types_all_drivers/biomass_soil/standard/full_extent/per_pixel/20241122/') +net_flux_per_pixel_full_extent_dir = os.path.join(s3_base_dir, 'net_flux_all_forest_types_all_drivers/biomass_soil/standard/full_extent/per_pixel/20241230/') # Net flux per pixel in forest extent pattern_net_flux_per_pixel_forest_extent = f'net_flux_Mg_CO2e_pixel_biomass_soil_forest_extent_2001_{loss_years}' -net_flux_per_pixel_forest_extent_dir = os.path.join(s3_base_dir, 'net_flux_all_forest_types_all_drivers/biomass_soil/standard/forest_extent/per_pixel/20241122/') +net_flux_per_pixel_forest_extent_dir = os.path.join(s3_base_dir, 'net_flux_all_forest_types_all_drivers/biomass_soil/standard/forest_extent/per_pixel/20241230/') ### 4x4 km aggregation tiles for mapping @@ -739,7 +742,7 @@ pattern_aggreg_sensit_perc_diff = f'net_flux_0_04deg_modelv{version_filename}_perc_diff_std' pattern_aggreg_sensit_sign_change = f'net_flux_0_04deg_modelv{version_filename}_sign_change_std' -output_aggreg_dir = os.path.join(s3_base_dir, '0_04deg_output_aggregation/biomass_soil/standard/20241122/') +output_aggreg_dir = os.path.join(s3_base_dir, '0_04deg_output_aggregation/biomass_soil/standard/20241230/') diff --git a/emissions/cpp_util/constants.h b/emissions/cpp_util/constants.h index b439d36c..601abb07 100644 --- a/emissions/cpp_util/constants.h +++ b/emissions/cpp_util/constants.h @@ -48,7 +48,7 @@ namespace constants constexpr char burnyear[] = "_tree_cover_loss_fire_processed.tif"; constexpr char fao_ecozones[] = "_fao_ecozones_bor_tem_tro_processed.tif"; constexpr char climate_zones[] = "_climate_zone_processed.tif"; - constexpr char tcl_drivers[] = "_drivers_of_TCL_1_km_20241121.tif"; + constexpr char tcl_drivers[] = "_drivers_of_TCL_1_km_20241224.tif"; constexpr char peat_mask[] = "_peat_mask_processed.tif"; constexpr char ifl_primary[] = "_ifl_2000_primary_2001_merged.tif"; constexpr char plantation_type[] = "_plantation_type_oilpalm_woodfiber_other.tif";