Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Readme Update: Changed typo in Purpose and Scope section from NH4 to CH4. * Update from previous Curtis driver to 1km drivers: -Updates drivers path and pattern in constants_and_names.py and constants.h -Added hard commodites flu value and new drivers class output paths to constants.h -Added new drivers classes (hard commodites and other natural disturbances) to preprocessing steps in calc_gross_emissions_generic.cpp (lines 1 - 530). -TODO: Update equations in calc_gross_emissions_generic.cpp from line 530 on. -Changed permanant agriculture (formerly commodity driven deforestation) flu vlaues in flu_val.cpp with updated values from IPCC 2019 Refinement for boreal/ temperate and tropical forests. -TODO: Decide what flu value to use for (climate_zone == 9) // Montane -TODO: Update equations.cpp file with information for new drivers. * Commit: - Changed drivers path and patterns and Flu values back to 10km drivers inputs for testing purposes - Deleted calc_gross_emissions_no_shifting_ag.cpp and calc_gross_emissions_convert_to_grassland.cpp since they are outdated and no longer being used for sensitivity analysis - Updated dataset, gdal, etc names in calc_gross_emissions_generic.cpp from int values to descriptive names (e.g. INGDAL1 >> INGDAL_AGC) - Added empty objects for CH4only and N2O only output but they have not been added to the decision tree/ calculation yet * Commit: - Changed python files for gross emission calculations - Successfully ran 1 tile locally using 10km drivers with new c++ code for biomass_soil. Processing time was slightly longer than v1.3.2 (6:42 vs 8:50) so pushing these changes so that I can test biomass_soil for 00N_000E on a spot machine. - TODOs: QC output then update soil_only c++ code and run with soil_only version * Commit: - Ran previous commit in EC2 instance and calc_gross_emissions_generic.cpp couldn't compile so I realized that the previous local run was from the old calc_gross_emissions_generic.exe - Fixed bugs so that new calc_gross_emissions_generic.cpp can compile - Successfully ran 1 tile with -sp then 3 tiles with mp locally using 10km drivers with new c++ code for biomass_soil. Processing time was approx 4 minutes faster than old code (5:05 vs 8:50). - TODOs: QC output then update soil_only c++ code and run with soil_only version * Commit: - Successfully ran calc_gross_emissions_soil_only.cpp for 00N_110E with -sp using 10km drivers * Commit: - Changing emis_run_date_biomass_soil in constants_and_names.py to '20248888' for full ec2 run * Commit: - In constants_and_names.py, updated version to 1.4.0, changed drivers to 1km drivers and deleted driver-specific emissions output - In constants.h, changed drivers to 1km drivers and deleted driver-specific emissions output - In flu_val.cpp, updated flu values for 1km drivers. Note: Currently using averages for "montane" climate zone, but in the future we will reclassify "montane" as "dry" or "moist/wet" and use those values instead of using averages. - In calc_gross_emissions_generic.cpp and calc_gross_emissions_soil_only.cpp, updated decision tree for permanent agriculture, shifting cultivation, forest management, wildfire, and settlements & infrastructure. Updated non-co2, fire emissions equation for forest management and wildfire to include litter and deadwood. TODO: Still need to update decision tree and node codes for hard commodities, other natural disturbances, and no driver. Also need to update equation.cpp. * Commit: - Updated calc_gross_emissions_generic.cpp, calc_gross_emissions_soil_only.cpp, and node codes with updated decision tree for hard commodities, other natural disturbances, and no driver. Added commented out code w/ TODOs to split non co2 emissions into CH4 only and N2O only. - Updated constants_and_names.py with dir and pattern for soil_only CH4_only and N2O_only outputs to use after splitting non co2 emissions. - Updated equations.cpp with new drivers classes. Changed combustion factor for other natural disturbances/ no drivers to boreal = 0.34 and temperate = 0.45. Added commented out code w/ TODOs to split non co2 emissions into CH4 only and N2O only. Q: How many sig figs to use for peat_drain_annual_CH4_only and peat_drain_annual_N2O_only - Added commented out code w/ TODOs to split non co2 emissions into CH4 only and N2O only in mp_calculate_gross_emissions.py. * Commit: - Fixed type issue (non_soil_bgc_c[x] to non_soil_bgc_c). calc_gross_emissions_generic.cpp compiles correctly now. calc_gross_emissions_soil_only.cpp also compiles * Commit: - Updated run_full_model.py to run test tiles with master script on spot machine from emissions stage onwards using new drivers * Commit: - Updated run_full_model.py to run test tiles with master script on spot machine from emissions stage onwards using new drivers * Commit: - Deleted 10km drivers path/pattern and driver-specific outputs for soil_only mode in constants_and_names.py. - Added a comment in calc_gross_emissions_generic.cpp, calc_gross_emissions_soil_only.cpp, and equations.cpp where peatburn_CH4_only is intitialized that there are no N2O emissions from burning peat. That way, we don't wonder in the future why N2O emissions has one less term than CH4 emissions (i.e. no peatburn_N2O_only) - Added note about making unassigned driver the same as other natural disturbances in calc_gross_emissions_generic.cpp and calc_gross_emissions_soil_only.cpp - Added link to the carbon_budget_flowchart.pptx at the top of the constants.h, equations.cpp, and flu_val.cpp since all three files use inputs from those slides. - Added note to constants.h and flu_val.cpp that the function in flu_val.cpp is specifically for the permanent agriculture driver - Updated peat_drain_annual_non_CO2 to 2 significant figures in equations.cpp Both the calc_gross_emissions_generic.cpp and calc_gross_emissions_soil_only.cpp compile without any errors * Commit: - Updated all relevant files to split the non-co2 emissions into CH4-only and N2O-only emissions output. Both the calc_gross_emissions_generic.cpp and the calc_gross_emissions_soil_only.cpp files compile correctly. * Commit: - Updated emis_run_date in constants_and_names.py to run updated output with 1km drivers and seperate output for CH4 and N2O * Commit: - Updated flux output dates in constants_and_names.py to run updated output with 1km drivers and seperate output for CH4 and N2O (forgot to include in last commit) * Commit: - During the full tile run, got the following error when trying to download the 1km tiles:"An error occurred (AccessDenied) when calling the GetObject operation: Access Denied". Troubleshooted in a small ec2 instance and realized that the --no-sign-request flag in the s3_folder_download utility was causing the issue. Added an additional if statement in the s3_folder_download utility without the --no-sign-request flag so that driver tiles can be downloaded. - soil_only CH4 and N2O rasters were not being uploaded to s3 even though they were created during the mode run. Realized that the upload tile step was looking for tiles with "gross_emis_ch4_only_all_drivers_Mg_CO2e_ha_soil_only_2001_23 pattern" but the tiles being created by the C++ code had pattern "gross_emis_CH4_only_all_drivers_Mg_CO2e_ha_soil_only_2001_23 pattern" (ie capitalized GHG). Changed pattern_gross_emis_ch4_only_all_drivers_soil_only and pattern_gross_emis_n2o_only_all_drivers_soil_only in constants_and_names.py from lower cased ch4 and n2o to capitalized CH4 and N2O. * Commit: - Changed drivers path and pattern in constants_and_names.py and constants.h from 20241004 to 20241121 * Update readme.md --------- Co-authored-by: dagibbs22 <[email protected]>
- Loading branch information
1 parent
e720247
commit f8348b8