Aggregated Fixes and Updates SOC and build mgmt #16
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
merge main into develop
- Added new variables and cases in `actions.f90` for improved plant and grass management. - Removed and re-added unused variables in `basin_module.f90` with updated comments. - Updated `cal_conditions.f90` and `cal_parm_select.f90` with new cases and logic for parameter handling. - Enhanced calibration logic in `calsoft_*` files for better ET and water yield management. - Modified calculations and logic in `ch_*` files for improved water quality and sediment handling. - Updated `channel_control.f90` and `climate_control.f90` for better flow and climate data handling. - Refactored `conditional_module.f90` and `conditions.f90` for improved condition checks and logic. - Enhanced `constituent_mass_module.f90` and `dtbl_scen_read.f90` for better data allocation and handling. - Improved `hru_*` files for better HRU management and output. - Refactored `hyd_*` files for better allocation and initialization of variables. - Updated `mgt_*` files for better management of irrigation and plant growth. - Enhanced `nut_solp.f90` and `object_read_output.f90` for better nutrient and output handling. - Improved `organic_mineral_mass_module.f90` and `output_landscape_*` files for better mass and output management. - Refactored `pathogen_init.f90` and `pesticide_init.f90` for better pathogen and pesticide handling. - Enhanced `pl_*` files for better plant growth and partitioning logic. - Updated `recall_read.f90` and `res_*` files for better reservoir and nutrient management. - Refactored `sd_channel_*` files for better sediment and erosion handling. - Improved `soil_*` files for better soil nutrient and carbon initialization. - Updated `structure_set_parms.f90` and `swr_percmain.f90` for better parameter setting and water management. - Enhanced `time_control.f90` for better time and land use change handling. - Improved `wallo_demand.f90` and `water_allocation_read.f90` for better water allocation and demand handling. - Refactored `wet_*` files for better wetland management and output.
Increase length of various character variables Extended character variable lengths in multiple modules: - `basin_module.f90`: `year`, `area_ha`, `yield_t` in `basin_yld_header` (+1) - `gwflow_read.f90`: `year` in `hydsep_hdr` (+2) - `hydrograph_module.f90`: `hd_type` in `hru_swift_header` (+1) - `manure_allocation_module.f90`: `s2un`, `s3un` in `mallo_header_units` (+5) - `output_landscape_module.f90`: `puptake` in `output_nutbal_header` (+1) - `reservoir_module.f90`: `j` in `res_in` and `res_out` headers (+1) - `soil_nutcarb_module.f90`: `mb_c` in `organic_carbon_units` (+3) - `water_allocation_module.f90`: `rcv_typ` in `wallo_header_units` (+1) - `water_allocation_module.f90`: `s2un`, `s3un` in `wallo_header_units` (+5)
Commented out unused format statements with `!*** tu Wunused-label:` prefix across multiple Fortran source files. This cleanup improves code readability and reduces potential confusion for future maintenance. Affected files include: - calsoft_control.f90 - ch_pathogen_output.f90 - command.f90 - cs_balance.f90 - gwflow_read.f90 - gwflow_simulate.f90 - hru_carbon_output.f90 - hru_output.f90 - hru_pathogen_output.f90 - lsreg_output.f90 - lsu_output.f90 - recall_nut.f90 - ru_output.f90 - salt_balance.f90 - salt_chem_hru.f90 - sep_biozone.f90 - sq_greenampt.f90 - surface.f90 - swift_output.f90 No changes to program functionality.
Extended the length of character variables across multiple files: - `actions.f90`: `lu_prev` from 25 to 40. - `cal_conditions.f90`: `chg_parm` from 16 to 25. - `conditional_module.f90`: `option` in `actions_var` from 25 to 40. - `gwflow_chan_read.f90`: `col_head_con` array elements from 8 to 20. - `hydrograph_module.f90`: `flo` in `hru_swift_header_base2` from 16 to 17. - `plant_data_module.f90`: `plts_bsn` array elements from 16 to 40. - `plant_module.f90`: - `fertname` in `fertilize_future` from 35 to 40. - `name` in `plant_community` from 35 to 40. - `pl` in `plant_community` from 16 to 40. - `last_kill` in `plant_community` from 16 to 40. - `soil_module.f90`: `snam` in `soil_profile` from 16 to 20. - `time_module.f90`: `cal_sim` from 25 to 29.
The `landuse` type's `urb_ro` variable in `hru_module.f90` has been modified to allow for longer strings, increasing its length from 16 to 40 characters. This change accommodates more detailed urban runoff model identification. Similarly, the `irr_src` variable in `hru_module.f90` has been updated to increase its length from 5 to 40 characters, allowing for more descriptive irrigation source specifications.
10_07_2024 source code
Modified output_landscape_init.f90 to split the single write statement into two separate statements. Now, bsn%name and prog are written to crop_yld_aa.txt on different lines.
Refactored residue decomposition logic and enhanced output formatting across multiple modules. Key changes include: - Modified `carbon_module.f90` to update `carbon_residue_gain_losses` type. - Added commented-out code in `cbn_zhang2.f90` for carbon loss calculations. - Updated `hru_control.f90` to call `rsd_decomp` and re-indented conditional blocks. - Enhanced `output_landscape_module.f90` for better readability and maintainability. - Removed and re-added fields in `output_landscape_module.f90` for consistent formatting. - Introduced new subroutine `rsd_decomp` in `rsd_decomp.f90` for daily N and P mineralization. - Made minor adjustments in `sd_channel_sediment3.f90` for clarity and precision. - Improved `swift_output.f90` header format for better precision.
…or each carbon components before summing the soil carbon components in the soil layers and changed what soil carbon constituents would be added to get a tot_org&c value.
Various fixes
added all GNU builds
Release management
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.