add_precip_snow_to_bmi

EcoExtreML · Feb 17, 2025 · cec2034 · cec2034
1 parent 875373d
commit cec2034
Show file tree

Hide file tree

Showing 182 changed files with 11 additions and 3 deletions.
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
diff --git a/.github/workflows/doc_deploy.yml b/.github/workflows/doc_deploy.yml
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
diff --git a/.github/workflows/publish-container.yml b/.github/workflows/publish-container.yml
diff --git a/.gitignore b/.gitignore
diff --git a/.vscode/launch.json b/.vscode/launch.json
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,12 +1,20 @@
 # Unreleased
 
-**Added:**
+**Changed:**
+- Change array shape of precipitation and runoff fluxes from time-series array to 1D array (for BMI purposes) discussed in [#280](https://github.com/EcoExtreML/STEMMUS_SCOPE/pull/280) and added in [#281](https://github.com/EcoExtreML/STEMMUS_SCOPE/pull/281) 
+
+**Fixed:**
+- Correct snow precipitation calcuations discussed in [#279](https://github.com/EcoExtreML/STEMMUS_SCOPE/issues/279) and fixed in [#281](https://github.com/EcoExtreML/STEMMUS_SCOPE/pull/281)
+
+<a name="1.6.2"></a>
+# [1.6.2](https://github.com/EcoExtreML/STEMMUS_SCOPE/releases/tag/1.6.2) - 17 Dec 2024
 
+The 1.6.2 release comes with minor changes as:
+
+**Added:**
 - Documentation using mkdocs and a github action workflow to publish the
   documentation in [#264](https://github.com/EcoExtreML/STEMMUS_SCOPE/pull/264)
 
-**Changed:**
-
 <a name="1.6.1"></a>
 # [1.6.1](https://github.com/EcoExtreML/STEMMUS_SCOPE/releases/tag/1.6.1) - 26 Sep 2024
 

diff --git a/Dockerfile b/Dockerfile
diff --git a/LICENSE b/LICENSE
diff --git a/README.md b/README.md
diff --git a/config_file_crib.txt b/config_file_crib.txt
diff --git a/config_file_crib_global.txt b/config_file_crib_global.txt
diff --git a/config_file_template.txt b/config_file_template.txt
diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md
diff --git a/docs/Octave_instructions.md b/docs/Octave_instructions.md
diff --git a/docs/STEMMUS_SCOPE_BMI.md b/docs/STEMMUS_SCOPE_BMI.md
diff --git a/docs/STEMMUS_SCOPE_on_CRIB.md b/docs/STEMMUS_SCOPE_on_CRIB.md
diff --git a/docs/STEMMUS_SCOPE_on_Snellius.md b/docs/STEMMUS_SCOPE_on_Snellius.md
diff --git a/docs/assets/ecoextreml_logo.png b/docs/assets/ecoextreml_logo.png
diff --git a/docs/assets/imgs/coupling_scheme.png b/docs/assets/imgs/coupling_scheme.png
diff --git a/docs/getting_started.md b/docs/getting_started.md
diff --git a/docs/index.md b/docs/index.md
diff --git a/docs/requirements.txt b/docs/requirements.txt
diff --git a/docs/run_model.md b/docs/run_model.md
diff --git a/example_data/input_soilLayThick.csv b/example_data/input_soilLayThick.csv
diff --git a/miss_hit.cfg b/miss_hit.cfg
diff --git a/mkdocs.yml b/mkdocs.yml
diff --git a/pull_request_template.md b/pull_request_template.md
diff --git a/run_model_on_snellius/README.md b/run_model_on_snellius/README.md
diff --git a/run_model_on_snellius/config_file_snellius.txt b/run_model_on_snellius/config_file_snellius.txt
diff --git a/run_model_on_snellius/config_file_snellius_global.txt b/run_model_on_snellius/config_file_snellius_global.txt
diff --git a/run_model_on_snellius/exe/README.md b/run_model_on_snellius/exe/README.md
diff --git a/run_model_on_snellius/exe/build_stemmus_scope_exe.sh b/run_model_on_snellius/exe/build_stemmus_scope_exe.sh
diff --git a/run_model_on_snellius/run_model.py b/run_model_on_snellius/run_model.py
diff --git a/run_model_on_snellius/run_stemmus_scope_snellius.sh b/run_model_on_snellius/run_stemmus_scope_snellius.sh
diff --git a/src/+conductivity/+hydraulicConductivity/calculateDTheta.m b/src/+conductivity/+hydraulicConductivity/calculateDTheta.m
diff --git a/src/+conductivity/+hydraulicConductivity/calculateDTheta_LLh.m b/src/+conductivity/+hydraulicConductivity/calculateDTheta_LLh.m
diff --git a/src/+conductivity/+hydraulicConductivity/calculateDTheta_UUh.m b/src/+conductivity/+hydraulicConductivity/calculateDTheta_UUh.m
diff --git a/src/+conductivity/+hydraulicConductivity/calculateGamma_hh.m b/src/+conductivity/+hydraulicConductivity/calculateGamma_hh.m
diff --git a/src/+conductivity/+hydraulicConductivity/calculateKL_h.m b/src/+conductivity/+hydraulicConductivity/calculateKL_h.m
diff --git a/src/+conductivity/+hydraulicConductivity/calculateSe.m b/src/+conductivity/+hydraulicConductivity/calculateSe.m
diff --git a/src/+conductivity/+hydraulicConductivity/calculateTheta.m b/src/+conductivity/+hydraulicConductivity/calculateTheta.m
diff --git a/src/+conductivity/+hydraulicConductivity/calculateTheta_II.m b/src/+conductivity/+hydraulicConductivity/calculateTheta_II.m
diff --git a/src/+conductivity/+hydraulicConductivity/calculateTheta_LL.m b/src/+conductivity/+hydraulicConductivity/calculateTheta_LL.m
diff --git a/src/+conductivity/+hydraulicConductivity/calculateTheta_UU.m b/src/+conductivity/+hydraulicConductivity/calculateTheta_UU.m
diff --git a/src/+conductivity/+hydraulicConductivity/calculateTheta_m.m b/src/+conductivity/+hydraulicConductivity/calculateTheta_m.m
diff --git a/src/+conductivity/+hydraulicConductivity/fixHeat.m b/src/+conductivity/+hydraulicConductivity/fixHeat.m
diff --git a/src/+conductivity/calculateGasConductivity.m b/src/+conductivity/calculateGasConductivity.m
diff --git a/src/+conductivity/calculateGasDispersivity.m b/src/+conductivity/calculateGasDispersivity.m
diff --git a/src/+conductivity/calculateHydraulicConductivity.m b/src/+conductivity/calculateHydraulicConductivity.m
diff --git a/src/+conductivity/calculateSoilThermalProperites.m b/src/+conductivity/calculateSoilThermalProperites.m
diff --git a/src/+conductivity/calculateThermalConductivityCapacity.m b/src/+conductivity/calculateThermalConductivityCapacity.m
diff --git a/src/+conductivity/calculateTransportCoefficient.m b/src/+conductivity/calculateTransportCoefficient.m
diff --git a/src/+conductivity/calculateVaporVariables.m b/src/+conductivity/calculateVaporVariables.m
diff --git a/src/+dryair/assembleCoefficientMatrices.m b/src/+dryair/assembleCoefficientMatrices.m
diff --git a/src/+dryair/calculateBoundaryConditions.m b/src/+dryair/calculateBoundaryConditions.m
diff --git a/src/+dryair/calculateDryAirParameters.m b/src/+dryair/calculateDryAirParameters.m
diff --git a/src/+dryair/calculateMatricCoefficients.m b/src/+dryair/calculateMatricCoefficients.m
diff --git a/src/+dryair/solveDryAirEquations.m b/src/+dryair/solveDryAirEquations.m
diff --git a/src/+dryair/solveTridiagonalMatrixEquations.m b/src/+dryair/solveTridiagonalMatrixEquations.m
diff --git a/src/+energy/assembleCoefficientMatrices.m b/src/+energy/assembleCoefficientMatrices.m
diff --git a/src/+energy/calculateBoundaryConditions.m b/src/+energy/calculateBoundaryConditions.m
diff --git a/src/+energy/calculateEnergyFluxes.m b/src/+energy/calculateEnergyFluxes.m
diff --git a/src/+energy/calculateEnergyParameters.m b/src/+energy/calculateEnergyParameters.m
diff --git a/src/+energy/calculateMatricCoefficients.m b/src/+energy/calculateMatricCoefficients.m
diff --git a/src/+energy/solveEnergyBalanceEquations.m b/src/+energy/solveEnergyBalanceEquations.m
diff --git a/src/+energy/solveTridiagonalMatrixEquations.m b/src/+energy/solveTridiagonalMatrixEquations.m
diff --git a/src/+equations/Planck.m b/src/+equations/Planck.m
diff --git a/src/+equations/Root_properties.m b/src/+equations/Root_properties.m
diff --git a/src/+equations/Soil_Inertia0.m b/src/+equations/Soil_Inertia0.m
diff --git a/src/+equations/Soil_Inertia1.m b/src/+equations/Soil_Inertia1.m
diff --git a/src/+equations/calcLambda.m b/src/+equations/calcLambda.m
diff --git a/src/+equations/calcPhi_s.m b/src/+equations/calcPhi_s.m
diff --git a/src/+equations/calc_msoc_fraction.m b/src/+equations/calc_msoc_fraction.m
diff --git a/src/+equations/calc_rssrbs.m b/src/+equations/calc_rssrbs.m
diff --git a/src/+equations/calczenithangle.m b/src/+equations/calczenithangle.m
diff --git a/src/+equations/fixedp_brent_ari.m b/src/+equations/fixedp_brent_ari.m
diff --git a/src/+equations/leafangles.m b/src/+equations/leafangles.m
diff --git a/src/+equations/meanleaf.m b/src/+equations/meanleaf.m
diff --git a/src/+equations/satvap.m b/src/+equations/satvap.m
diff --git a/src/+equations/soil_respiration.m b/src/+equations/soil_respiration.m
diff --git a/src/+equations/tav.m b/src/+equations/tav.m
diff --git a/src/+equations/van_genuchten.m b/src/+equations/van_genuchten.m
diff --git a/src/+equations/zo_and_d.m b/src/+equations/zo_and_d.m
diff --git a/src/+groundwater/calculateGroundWaterDepth.m b/src/+groundwater/calculateGroundWaterDepth.m
diff --git a/src/+groundwater/calculateGroundwaterRecharge.m b/src/+groundwater/calculateGroundwaterRecharge.m
diff --git a/src/+groundwater/calculateIndexAquifer.m b/src/+groundwater/calculateIndexAquifer.m
diff --git a/src/+groundwater/calculateIndexBottomLayer.m b/src/+groundwater/calculateIndexBottomLayer.m
diff --git a/src/+groundwater/initializeGroundwaterSettings.m b/src/+groundwater/initializeGroundwaterSettings.m
diff --git a/src/+groundwater/updateDunnianRunoff.m b/src/+groundwater/updateDunnianRunoff.m
diff --git a/src/+helpers/Sint.m b/src/+helpers/Sint.m
diff --git a/src/+helpers/aggreg.m b/src/+helpers/aggreg.m
diff --git a/src/+helpers/calculateTimeZone.m b/src/+helpers/calculateTimeZone.m
diff --git a/src/+helpers/count.m b/src/+helpers/count.m
diff --git a/src/+helpers/createStructure.m b/src/+helpers/createStructure.m
diff --git a/src/+helpers/heaviside1.m b/src/+helpers/heaviside1.m
diff --git a/src/+init/applySoilHeteroEffect.m b/src/+init/applySoilHeteroEffect.m
diff --git a/src/+init/applySoilHeteroWithInitialFreezing.m b/src/+init/applySoilHeteroWithInitialFreezing.m
diff --git a/src/+init/calcInitH.m b/src/+init/calcInitH.m
diff --git a/src/+init/calcLambda.m b/src/+init/calcLambda.m
diff --git a/src/+init/calcPhi_s.m b/src/+init/calcPhi_s.m
diff --git a/src/+init/calcSoilMatricHead.m b/src/+init/calcSoilMatricHead.m
diff --git a/src/+init/calcSoilTemp.m b/src/+init/calcSoilTemp.m
diff --git a/src/+init/calculateInitialThermal.m b/src/+init/calculateInitialThermal.m
diff --git a/src/+init/defineInitialValues.m b/src/+init/defineInitialValues.m
diff --git a/src/+init/defineSoilVariables.m b/src/+init/defineSoilVariables.m
diff --git a/src/+init/setBoundaryCondition.m b/src/+init/setBoundaryCondition.m
diff --git a/src/+init/setVanGenuchtenParameters.m b/src/+init/setVanGenuchtenParameters.m
diff --git a/src/+init/soilHeteroSubroutine.m b/src/+init/soilHeteroSubroutine.m
diff --git a/src/+init/updateBtmh.m b/src/+init/updateBtmh.m
diff --git a/src/+init/updateGammaH.m b/src/+init/updateGammaH.m
diff --git a/src/+init/updateHfreez.m b/src/+init/updateHfreez.m
diff --git a/src/+init/updateInitH.m b/src/+init/updateInitH.m
diff --git a/src/+init/updateSoilVariables.m b/src/+init/updateSoilVariables.m
diff --git a/src/+io/bin_to_csv.m b/src/+io/bin_to_csv.m
diff --git a/src/+io/calculateSoilLayerThickness.m b/src/+io/calculateSoilLayerThickness.m
diff --git a/src/+io/create_output_files_binary.m b/src/+io/create_output_files_binary.m
diff --git a/src/+io/define_bands.m b/src/+io/define_bands.m
diff --git a/src/+io/define_constants.m b/src/+io/define_constants.m
diff --git a/src/+io/getModelSettings.m b/src/+io/getModelSettings.m
diff --git a/src/+io/getSoilConstants.m b/src/+io/getSoilConstants.m
diff --git a/src/+io/initialize_output_structures.m b/src/+io/initialize_output_structures.m
diff --git a/src/+io/loadForcingData.m b/src/+io/loadForcingData.m
diff --git a/src/+io/loadSoilInitialValues.m b/src/+io/loadSoilInitialValues.m
diff --git a/src/+io/loadTimeSeries.m b/src/+io/loadTimeSeries.m
diff --git a/src/+io/output_data_binary.m b/src/+io/output_data_binary.m
diff --git a/src/+io/output_verification.m b/src/+io/output_verification.m
diff --git a/src/+io/prepareInputData.m b/src/+io/prepareInputData.m
diff --git a/src/+io/readSoilLayerSettings.m b/src/+io/readSoilLayerSettings.m
diff --git a/src/+io/readStructFromExcel.m b/src/+io/readStructFromExcel.m
diff --git a/src/+io/read_config.m b/src/+io/read_config.m
diff --git a/src/+io/select_input.m b/src/+io/select_input.m
diff --git a/src/+io/timestamp2datetime.m b/src/+io/timestamp2datetime.m
diff --git a/src/+parameters/loadParameters.m b/src/+parameters/loadParameters.m
diff --git a/src/+parameters/setTempParameters.m b/src/+parameters/setTempParameters.m
diff --git a/src/+plot/plots.m b/src/+plot/plots.m
diff --git a/src/+soilmoisture/assembleCoefficientMatrices.m b/src/+soilmoisture/assembleCoefficientMatrices.m
diff --git a/src/+soilmoisture/calculateAerodynamicResistance.m b/src/+soilmoisture/calculateAerodynamicResistance.m
diff --git a/src/+soilmoisture/calculateBoundaryConditions.m b/src/+soilmoisture/calculateBoundaryConditions.m
diff --git a/src/+soilmoisture/calculateEvapotranspiration.m b/src/+soilmoisture/calculateEvapotranspiration.m
diff --git a/src/+soilmoisture/calculateMatricCoefficients.m b/src/+soilmoisture/calculateMatricCoefficients.m
diff --git a/src/+soilmoisture/calculateTimeDerivatives.m b/src/+soilmoisture/calculateTimeDerivatives.m
diff --git a/src/+soilmoisture/calculatesSoilWaterFluxes.m b/src/+soilmoisture/calculatesSoilWaterFluxes.m
diff --git a/src/+soilmoisture/solveSoilMoistureBalance.m b/src/+soilmoisture/solveSoilMoistureBalance.m
diff --git a/src/+soilmoisture/solveTridiagonalMatrixEquations.m b/src/+soilmoisture/solveTridiagonalMatrixEquations.m
diff --git a/src/BSM.m b/src/BSM.m
diff --git a/src/Density_DA.m b/src/Density_DA.m
diff --git a/src/Density_V.m b/src/Density_V.m
diff --git a/src/Dtrmn_Z.m b/src/Dtrmn_Z.m
diff --git a/src/HT_frez.m b/src/HT_frez.m
diff --git a/src/Initial_root_biomass.m b/src/Initial_root_biomass.m
diff --git a/src/Latent.m b/src/Latent.m
diff --git a/src/Max_Rootdepth.m b/src/Max_Rootdepth.m
diff --git a/src/RTMf.m b/src/RTMf.m
diff --git a/src/RTMo.m b/src/RTMo.m
diff --git a/src/RTMt_planck.m b/src/RTMt_planck.m
diff --git a/src/RTMt_sb.m b/src/RTMt_sb.m
diff --git a/src/RTMz.m b/src/RTMz.m
diff --git a/src/Root_properties.m b/src/Root_properties.m
diff --git a/src/STEMMUS_SCOPE.m b/src/STEMMUS_SCOPE.m
diff --git a/src/STEMMUS_SCOPE_exe.m b/src/STEMMUS_SCOPE_exe.m
diff --git a/src/StartInit.m b/src/StartInit.m
diff --git a/src/UpdateSoilWaterContent.m b/src/UpdateSoilWaterContent.m
diff --git a/src/biochemical.m b/src/biochemical.m
diff --git a/src/biochemical_MD12.m b/src/biochemical_MD12.m
diff --git a/src/calc_brdf.m b/src/calc_brdf.m
diff --git a/src/calc_rsoil.m b/src/calc_rsoil.m
diff --git a/src/calc_sfactor.m b/src/calc_sfactor.m
diff --git a/src/debug_Octave.m b/src/debug_Octave.m
diff --git a/src/ebal.m b/src/ebal.m
diff --git a/src/filenames.m b/src/filenames.m
diff --git a/src/fluspect_B_CX.m b/src/fluspect_B_CX.m
diff --git a/src/fluspect_B_CX_PSI_PSII_combined.m b/src/fluspect_B_CX_PSI_PSII_combined.m
diff --git a/src/heatfluxes.m b/src/heatfluxes.m
diff --git a/src/resistances.m b/src/resistances.m
diff --git a/src/updateWettingHistory.m b/src/updateWettingHistory.m
diff --git a/test/compare_git_branch_results.ipynb b/test/compare_git_branch_results.ipynb
diff --git a/utils/csv_to_nc/README.md b/utils/csv_to_nc/README.md
diff --git a/utils/csv_to_nc/required_netcdf_variables.csv b/utils/csv_to_nc/required_netcdf_variables.csv
diff --git a/utils/notebooks/download_era5_data.ipynb b/utils/notebooks/download_era5_data.ipynb