-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* added pseudo-framework example for coupling with CFE, removed the standalone example. * updated readme and install instructions. * added realization file for cfe, and updated CI workflow. * set soil_storage to non-zero in the unittest, 0 triggers assertion. * a minor change * removed the extra dash '-' from '--DCFE' * modified CI .ymal file to have unique submod IDs. * removed a comma. * minor changes to CI yaml file to build CFE. * Update INSTALL.md * Update INSTALL.md --------- Co-authored-by: Rachel McDaniel <[email protected]>
- Loading branch information
1 parent
9bf77fc
commit 8ae1d74
Showing
15 changed files
with
675 additions
and
595 deletions.
There are no files selected for viewing
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,46 +1,40 @@ | ||
| # SoilMoistureProfiles | ||
| The soil moisture profiles schemes provide soil moisture distributed over a one-dimensional vertical column. These schemes facilitate coupling among different models such as (CFE and SFT or LASAM and SFT). The following three schemes are provided here to compute vertical soil moisture profiles. | ||
| * Scheme for conceptual soil reservoirs (e.g., **[CFE](https://github.com/NOAA-OWP/cfe))** | ||
| The soil moisture profiles schemes provide soil moisture distributed over a one-dimensional vertical column and depth to water table. These schemes facilitate coupling among hydrological and thermal models such as (CFE and SFT or LASAM and SFT). It can also be coupled with conceptual hydrologic models to compute rootzone-based actual evapotranspiration. The following three schemes are provided here to compute vertical soil moisture profiles and water table depth. | ||
| * Scheme for conceptual soil reservoirs (e.g., **[CFE](https://github.com/NOAA-OWP/cfe))** | ||
| * Schemes for layered soil reservoirs (e.g., **[LGAR](https://github.com/NOAA-OWP/LGAR-C))** | ||
| * Schemes for topmodel (details are provided below; **[TopModel](https://github.com/NOAA-OWP/topmodel))** | ||
|
|
||
| ## Conceptual soil reservoir | ||
| For conceptual reservoirs, see the following schematic and algorithm. We use the Clap-Hornberger soil moisture characteristic function here, and **soil moisture storage** is the main input passed through a BMI. | ||
| For conceptual reservoirs, see the following schematic and algorithm. We use the Clap-Hornberger soil moisture characteristic function here, and **soil_storage** and **soil_storage_chage** are the two inputs passed through BMI. | ||
|
|
||
|  | ||
|
|
||
| ## Layered soil reservoir | ||
| For layered soil reservoirs, the two options include | ||
| For layered soil reservoirs, the two options include | ||
| * constant by layer, and Clap-Horngerger soil moisture characteristic function for the profile below the depth of the last layer | ||
| * linearly interpolated profile between consecutive layers, and Clap-Horngerger soil moisture characteristic function for the profile below the depth of the last layer | ||
|
|
||
| ## Topmodel based soil reservoir | ||
| * (flux-based method) A method using an iterative scheme to first compute watertable depth and then soil moisture profile ([Blazkova et al. (2002)](https://agupubs.onlinelibrary.wiley.com/doi/full/10.1029/2001WR000912)) | ||
| * (deficit-based method) A method using catchment deficit to first compute watertable depth and then soil moisture profile ([Franchini et al. (1996)](https://www.sciencedirect.com/science/article/abs/pii/S0022169496800151) | ||
|
|
||
|
|
||
| ## Build and Run Instructions | ||
| Detailed instructions on how to build and run SoilMoistureProfiels (SMP) can be found here [INSTALL](https://github.com/NOAA-OWP/SoilMoistureProfiles/blob/ajk/doc_update/INSTALL.md). | ||
| Detailed instructions on how to build and run SoilMoistureProfiels (SMP) can be found here [INSTALL](https://github.com/NOAA-OWP/SoilMoistureProfiles/blob/main/INSTALL.md). | ||
| - Test examples highlights | ||
| - Unittest: (see [tests](https://github.com/NOAA-OWP/SoilMoistureProfiles/blob/ajk/doc_update/tests/README.md)) | ||
| - Standalone: An example computing `watertable` and `soil_moisture_profile` using a soil conceptual reservoir (see [build/run](https://github.com/NOAA-OWP/SoilMoistureProfiles/blob/ajk/doc_update/INSTALL.md#standalone-example)) | ||
| - With topmodel: An example coupling TopModel to SMP (Soil Moisture Profiles) to compute `watertable` and `soil_moisture_profile` (see [build/run](https://github.com/NOAA-OWP/SoilMoistureProfiles/blob/ajk/doc_update/INSTALL.md#pseudo-framework-example)) | ||
| - Nextgen examples: Realization files for the two above examples (Standalone and with topmodel) are provided [here](https://github.com/NOAA-OWP/SoilMoistureProfiles/blob/ajk/doc_update/realizations) (see [build/run](https://github.com/NOAA-OWP/SoilMoistureProfiles/blob/ajk/doc_update/INSTALL.md#nextgen-framework-example)). | ||
| - Unittest: (see [tests](https://github.com/NOAA-OWP/SoilMoistureProfiles/blob/main/tests/README.md)) | ||
| - With CFE: An example coupling CFE with SMP (Soil Moisture Profiles) to compute `watertable` and `soil_moisture_profile` (see [build/run](https://github.com/NOAA-OWP/SoilMoistureProfiles/blob/main/INSTALL.mdd#pseudo-framework-example-1)) | ||
| - With topmodel: An example coupling TopModel to SMP (Soil Moisture Profiles) to compute `watertable` and `soil_moisture_profile` (see [build/run](https://github.com/NOAA-OWP/SoilMoistureProfiles/blob/main/INSTALL.md#pseudo-framework-example-2)) | ||
| - Nextgen examples: Realization files for the two above examples (Standalone and with topmodel) are provided [here](https://github.com/NOAA-OWP/SoilMoistureProfiles/blob/main/realizations) (see [build/run](https://github.com/NOAA-OWP/SoilMoistureProfiles/blob/main/INSTALL.md#nextgen-framework-example)). | ||
|
|
||
| ## Model Configuration File | ||
| Detailed description of the parameters for model configuration is provided ([here](https://github.com/NOAA-OWP/SoilMoistureProfiles/tree/ajk/doc_update/configs/README.md)) | ||
| Detailed description of the parameters for model configuration is provided ([here](https://github.com/NOAA-OWP/SoilMoistureProfiles/tree/main/configs/README.md)) | ||
|
|
||
| ## Getting help | ||
| For questions, please contact Ahmad Jan (ahmad.jan(at)noaa.gov), the main developer/maintainer of the repository. | ||
|
|
||
| ## Known issues or raise an issue | ||
| We are constantly looking to improve the model and/or fix bugs as they arise. Please see the Git Issues for known issues or if you want to suggest adding a capability or to report a bug, please open an issue. | ||
|
|
||
| ## Getting involved | ||
| See general instructions to contribute to the model development ([instructions](https://github.com/NOAA-OWP/SoilMoistureProfiles/blob/ajk/doc_update/CONTRIBUTING.md)) or simply fork the repository and submit a pull request. | ||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
| See general instructions to contribute to the model development ([instructions](https://github.com/NOAA-OWP/SoilMoistureProfiles/blob/main/CONTRIBUTING.md)) or simply fork the repository and submit a pull request. |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| forcing_file=./extern/cfe/forcings/cat87_01Dec2015.csv | ||
| soil_params.depth=2.0[m] | ||
| soil_params.b=4.05[] | ||
| soil_params.satdk=0.00000338[m s-1] | ||
| soil_params.satpsi=0.355[m] | ||
| soil_params.slop=0.01[m/m] | ||
| soil_params.smcmax=0.439[m/m] | ||
| soil_params.wltsmc=0.066[m/m] | ||
| soil_params.expon=1.0[] | ||
| soil_params.expon_secondary=1.0[] | ||
| max_gw_storage=0.25[m] | ||
| Cgw=1.8e-05[m h-1] | ||
| expon=6.0[] | ||
| gw_storage=0.125[m/m] | ||
| alpha_fc=0.33[] | ||
| soil_storage=0.585626[m/m] | ||
| K_nash=0.03[] | ||
| K_lf=0.01[] | ||
| nash_storage=0.0,0.0 | ||
| giuh_ordinates=0.06,0.51,0.28,0.12,0.03 | ||
| num_timesteps=1 | ||
| verbosity=1 | ||
| surface_runoff_scheme=GIUH | ||
| surface_partitioning_scheme=Xinanjiang | ||
| a_Xinanjiang_inflection_point_parameter=1 | ||
| b_Xinanjiang_shape_parameter=1 | ||
| x_Xinanjiang_shape_parameter=1 | ||
| urban_decimal_fraction=0.0 | ||
| DEBUG=0 | ||
| #surface_partitioning_scheme=Schaake | ||
| #ice_fraction=0 | ||
| #ice_content_threshold=0.15 |
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.