-
Notifications
You must be signed in to change notification settings - Fork 170
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
New Soil temperature tidy up #9283
Merged
Merged
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit
Hold shift + click to select a range
a456b4e
Added some component-based sand-silt-clay and rocks sensitivity tests
sno036 50f7b23
Added sensitivity tests for the estimated texture and rocks contents.…
sno036 41c0673
Merge branch 'master' of https://github.com/APSIMInitiative/ApsimX in…
rcichota 12657a7
Tidying up the code - phase 1a, just 'summary' tags.
rcichota 6b31398
More code tidy up (add summary tags to variables)
rcichota 50927d5
More tiying up, sorting variables from constants (not finished)
rcichota 4669032
Bring in changes done by Dean in another branch
rcichota 0d4ed31
Fix changed stats on jenkins
hol353 6e3b1d8
Replacing dictionary with properties of sol constitutents with functi…
rcichota bc091c6
Merge branch 'master' of https://github.com/APSIMInitiative/ApsimX in…
rcichota c7ef722
Fix last commit to replicate original code (actaully is wrong... to b…
rcichota 9484c4b
Deleting or a number of functions taht were not used, plus replacing …
rcichota 1212ca8
Merge branch 'master' of https://github.com/APSIMInitiative/ApsimX in…
rcichota 8fd8453
Add in changes done by Dean
rcichota 554d28c
update parameter for deth to constant temperature
rcichota 26bb213
Further clean up in code, reduce redundant variables and excess of co…
rcichota c33b851
Another batch of updates, tidying up some variable names, more summar…
rcichota 98b23de
Fix a bunch of inits / doco
rcichota c038af2
remove all tabs and trailing spaces
rcichota c2fbeaa
replace internal wind variable with weather.wind
rcichota f7bebf9
replace interal airpressure variable with weather.AorPressure
rcichota fe0760f
move weather files in test sim folder to 'proper' weather folder
rcichota a77f8f2
add a seed to WeatherSampler so example simulation runs
rcichota 24336d1
Update ISoilTemperature and dependencies to include variables for soi…
rcichota e609ef4
Fixing a few references to SoilTemperature variables
rcichota 918b7af
Merge branch 'master' of https://github.com/APSIMInitiative/ApsimX in…
rcichota File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -131,9 +131,27 @@ private void Clear() | |
surf_temp[day] = ave_temp; | ||
} | ||
|
||
/// <summary>Returns soil temperature for each layer (oc)</summary> | ||
/// <summary>Soil temperature for each layer (oC)</summary> | ||
public double[] Value { get { return st; } } | ||
|
||
/// <summary>Average soil temperature for each layer (oC)</summary> | ||
public double[] AverageSoilTemperature { get { return st; } } | ||
|
||
/// <summary>Average soil temperature for soil surface (oC)</summary> | ||
public double AverageSoilSurfaceTemperature { get { return double.NaN; } } | ||
|
||
/// <summary>Average soil temperature for each layer (oC)</summary> | ||
public double[] MinimumSoilTemperature { get { return st; } } | ||
|
||
/// <summary>Average soil temperature for soil surface (oC)</summary> | ||
public double MinimumSoilSurfaceTemperature { get { return double.NaN; } } | ||
|
||
/// <summary>Average soil temperature for each layer (oC)</summary> | ||
public double[] MaximumSoilTemperature { get { return st; } } | ||
|
||
/// <summary>Average soil temperature for soil surface (oC)</summary> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Daily maximum soil temperature |
||
public double MaximumSoilSurfaceTemperature { get { return double.NaN; } } | ||
|
||
/// <summary>Called to perform soil temperature calculations</summary> | ||
/// <param name="sender">The sender.</param> | ||
/// <param name="e">The <see cref="EventArgs"/> instance containing the event data.</param> | ||
|
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Daily minimum soil temperature
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We thought about using the term "Daily" in the name, but it would make it long, and Dean remarks that all variables in APSIM are on a daily basis... I will correct the info in the summary tag in the next commit...