diff --git a/CHANGELOG.md b/CHANGELOG.md index d522ed88..a6443d4c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,8 @@ [194](https://github.com/EcoExtreML/STEMMUS_SCOPE/pull/194) - All `Engry_*` functions are refcatored and moved to `+energy` folder in [197](https://github.com/EcoExtreML/STEMMUS_SCOPE/pull/197) +- Remove `ObservationPoints` script +[200](https://github.com/EcoExtreML/STEMMUS_SCOPE/pull/200) **Fixed:** @@ -17,6 +19,7 @@ - issue [#98](https://github.com/EcoExtreML/STEMMUS_SCOPE/issues/98) - issue [#99](https://github.com/EcoExtreML/STEMMUS_SCOPE/issues/99) - issue [#100](https://github.com/EcoExtreML/STEMMUS_SCOPE/issues/100) +- issue [#101](https://github.com/EcoExtreML/STEMMUS_SCOPE/issues/101) # [1.3.0](https://github.com/EcoExtreML/STEMMUS_SCOPE/releases/tag/1.3.0) - 22 Jun 2023 diff --git a/run_model_on_snellius/exe/STEMMUS_SCOPE b/run_model_on_snellius/exe/STEMMUS_SCOPE index 4d937bdc..29138cca 100755 Binary files a/run_model_on_snellius/exe/STEMMUS_SCOPE and b/run_model_on_snellius/exe/STEMMUS_SCOPE differ diff --git a/src/ObservationPoints.m b/src/ObservationPoints.m deleted file mode 100644 index 44af7345..00000000 --- a/src/ObservationPoints.m +++ /dev/null @@ -1,22 +0,0 @@ -%% With 37 node-500cm Length KT=681 with 0.35/3600 Prep., while KT=708 with 0.4/3600 -% 2cm 5cm 10cm 20cm 30cm 40cm 50cm -% 34 31 26 21 19 17 15 -%% -% Moni_Depth=[34 31 26 21 19 17 15]; -% Moni_Depth_SM=[26 21 19 17 15]; - -% Sim_Theta(KT,1:5)=Theta_LLL(Moni_Depth_SM,1,KT); -% Sim_Temp(KT,1:7)=TTT(Moni_Depth,KT); - -NL = 54; -Moni_Depth = NL:-1:1; -Moni_Depth_SM = NL:-1:1; -Moni_Depth_RT = NL:-1:1; - -Sim_Theta(KT, 1:length(Moni_Depth_SM)) = Theta_LLL(Moni_Depth_SM, 1, KT); -Sim_Theta_I(KT, 1:length(Moni_Depth_SM)) = Theta_III(Moni_Depth_SM, 1, KT); -Sim_Theta_U(KT, 1:length(Moni_Depth_SM)) = Theta_UUU(Moni_Depth_SM, 1, KT); -Sim_Temp(KT, 1:length(Moni_Depth)) = TTT(Moni_Depth, KT); -if rwuef == 1 - Sim_SRT(KT, 1:length(Moni_Depth)) = SRT(Moni_Depth, KT); -end diff --git a/src/STEMMUS_SCOPE.m b/src/STEMMUS_SCOPE.m index 2ce2b613..60b95488 100644 --- a/src/STEMMUS_SCOPE.m +++ b/src/STEMMUS_SCOPE.m @@ -352,6 +352,12 @@ Delt_t0 = Delt_t; % Duration of last time step TOLD_CRIT = []; +% for soil moisture and temperature outputs +monitorDepthTemperature = ModelSettings.NL:-1:1; +monitorDepthSoilMoisture = ModelSettings.NL:-1:1; +Sim_Theta_U = []; +Sim_Temp = []; + % Srt, root water uptake; Srt = InitialValues.Srt; % will be updated! P_gg = InitialValues.P_gg; % will be updated! @@ -736,7 +742,9 @@ SoilVariables.Theta_U = Theta_U; SoilVariables.Theta_I = Theta_I; - run ObservationPoints; + % replace run ObservationPoints, see issue 101 + Sim_Theta_U(KT, 1:length(monitorDepthSoilMoisture)) = Theta_UUU(monitorDepthSoilMoisture, 1, KT); + Sim_Temp(KT, 1:length(monitorDepthTemperature)) = TTT(monitorDepthTemperature, KT); end if (TEND - TIME) < 1E-3 for MN = 1:NN