-
Notifications
You must be signed in to change notification settings - Fork 2
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
Soilwat co2 effects #22
Commits on Mar 23, 2017
-
Add initial CO2 effects on biomass
TODO: * Remove the additional start() parameters once that data is transferred to inputData * Test with rSFSW2 and rSOILWAT2 once changes have been done there (has succesfully worked with local old repos) * Confirm placement of global variable initializations
Configuration menu - View commit details
-
Copy full SHA for 1755c28 - Browse repository at this point
Copy the full SHA 1755c28View commit details
Commits on Apr 13, 2017
-
Includes: * Adding a structure SW_Carbon to avoid clogging up the global space * Moved R CO2 settings to S4 class * onGet/onSet functions to interact with S4 class and its respective object * Removal of additional parameters to SEXP start() SOILWAT2 remains fully functional by itself, and seems fully functional with rSOILWAT2's CO2 branch
Configuration menu - View commit details
-
Copy full SHA for 4e07494 - Browse repository at this point
Copy the full SHA 4e07494View commit details
Commits on Apr 18, 2017
-
Configuration menu - View commit details
-
Copy full SHA for 71bcd9f - Browse repository at this point
Copy the full SHA 71bcd9fView commit details
Commits on Apr 25, 2017
-
Change "Retro" to "Historical", Change "SW_Carbon_Get()" to "calculat…
…e_CO2_multipliers()"
Configuration menu - View commit details
-
Copy full SHA for 1a53bcf - Browse repository at this point
Copy the full SHA 1a53bcfView commit details
Commits on Apr 28, 2017
-
Change multiplier equations and PPMs
This changes results massively. Linear equations were previously used for WUE and Biomass multipliers, which have been switched to power equations in this commit. Additionally, the correct source is being used for the PPMs now.
Configuration menu - View commit details
-
Copy full SHA for 2ff6863 - Browse repository at this point
Copy the full SHA 2ff6863View commit details
Commits on May 2, 2017
-
* @biomass --> @CO2EFFECTS * Added yearly output * Added a total biomass column * Added a WUE multiplier column * Removed additional column * This slot, and this slot only, now reflects the proper future simulation years
Configuration menu - View commit details
-
Copy full SHA for 1de06cc - Browse repository at this point
Copy the full SHA 1de06ccView commit details -
Configuration menu - View commit details
-
Copy full SHA for b9e2f19 - Browse repository at this point
Copy the full SHA b9e2f19View commit details
Commits on May 4, 2017
-
ALL output slots now display correct simulation year
Previously, when future scenarios were run, the original years would be used as output. For instance, a scenario in 2020-2050 would have outputs from 1980-2010. I've utilized the delta year that I pass in for carbon effects and added it to the model year ONLY IN THE OUTPUT FUNCTIONALITY. The rest of the model still needs the 'incorrect' years.
Configuration menu - View commit details
-
Copy full SHA for 050dfbb - Browse repository at this point
Copy the full SHA 050dfbbView commit details
Commits on Jul 1, 2017
-
Apply biomass multiplier to tree's fraction live biomass, not total biomass. Note that the output column name still needs to be changed in rSFSW2/rSOILWAT2.
Configuration menu - View commit details
-
Copy full SHA for 0649b9f - Browse repository at this point
Copy the full SHA 0649b9fView commit details -
@CO2EFFECTS Column "TreeBiomass" --> "TreePctLive"
Disregard the description in the last commit, I forgot that SOILWAT2 holds the instance of the rSOILWAT2 output class
Configuration menu - View commit details
-
Copy full SHA for cfd7b66 - Browse repository at this point
Copy the full SHA cfd7b66View commit details
Commits on Jul 5, 2017
-
Configuration menu - View commit details
-
Copy full SHA for 0259df9 - Browse repository at this point
Copy the full SHA 0259df9View commit details
Commits on Jul 18, 2017
-
Configuration menu - View commit details
-
Copy full SHA for 469652c - Browse repository at this point
Copy the full SHA 469652cView commit details -
Configuration menu - View commit details
-
Copy full SHA for c17ce29 - Browse repository at this point
Copy the full SHA c17ce29View commit details -
Configuration menu - View commit details
-
Copy full SHA for 2f644d1 - Browse repository at this point
Copy the full SHA 2f644d1View commit details
Commits on Aug 19, 2017
-
Add a constructor for the SW_CARBON structure, remove legacy defensiv…
Configuration menu - View commit details
-
Copy full SHA for 0810780 - Browse repository at this point
Copy the full SHA 0810780View commit details
Commits on Aug 21, 2017
-
Configuration menu - View commit details
-
Copy full SHA for 9b075bb - Browse repository at this point
Copy the full SHA 9b075bbView commit details
Commits on Sep 1, 2017
-
Merge branch 'master' into soilwat_co2_effects
# Conflicts: # makefile --> merged # makefile_n --> removed
Configuration menu - View commit details
-
Copy full SHA for 06ecd23 - Browse repository at this point
Copy the full SHA 06ecd23View commit details
Commits on Sep 2, 2017
-
Tabs to spaces, reducing reliance on hard-coded values, constructor, comments, change the stomatal term to water-usage efficiency, be more consistent on variable names
Configuration menu - View commit details
-
Copy full SHA for 9940e62 - Browse repository at this point
Copy the full SHA 9940e62View commit details
Commits on Sep 27, 2017
-
Reset the default input year to 2010
2280 was used to test the performance and robustness of CO2 calculations
Configuration menu - View commit details
-
Copy full SHA for 75b1359 - Browse repository at this point
Copy the full SHA 75b1359View commit details
Commits on Oct 10, 2017
-
2
Configuration menu - View commit details
-
Copy full SHA for 6d4c7e9 - Browse repository at this point
Copy the full SHA 6d4c7e9View commit details -
Configuration menu - View commit details
-
Copy full SHA for a924ee9 - Browse repository at this point
Copy the full SHA a924ee9View commit details -
Configuration menu - View commit details
-
Copy full SHA for a8b55a2 - Browse repository at this point
Copy the full SHA a8b55a2View commit details
Commits on Oct 24, 2017
-
Configuration menu - View commit details
-
Copy full SHA for cd23a9a - Browse repository at this point
Copy the full SHA cd23a9aView commit details -
Configuration menu - View commit details
-
Copy full SHA for e8f656b - Browse repository at this point
Copy the full SHA e8f656bView commit details
Commits on Nov 12, 2017
-
Configuration menu - View commit details
-
Copy full SHA for ebd139a - Browse repository at this point
Copy the full SHA ebd139aView commit details
Commits on Nov 16, 2017
-
Configuration menu - View commit details
-
Copy full SHA for 09795c5 - Browse repository at this point
Copy the full SHA 09795c5View commit details -
- updated code because GET_SLOT(object, install("CO2ppm") is now a matrix with two columns 'Year' and 'CO2ppm' - we first need to find the correct row based on 'Year' - then we can loop and extract CO2 concentration data
2Configuration menu - View commit details
-
Copy full SHA for 2be529c - Browse repository at this point
Copy the full SHA 2be529cView commit details
Commits on Nov 17, 2017
-
Prepare code to use function
SW_CBN_read
to read CO2 from file- functions 'onGetInputDataFromFiles' and '_read_inputs' are now reading in CO2 data from the input file on disk -- in parallel to their behavior of reading in all other data from disk files - function 'onGetInputDataFromFiles' gained an internal 'debug' variable which now prints debug statements (instead having comments in the code) - Function 'SW_CBN_read' is currently a mock
Configuration menu - View commit details
-
Copy full SHA for 445fa79 - Browse repository at this point
Copy the full SHA 445fa79View commit details -
Implement functionality of 'SW_CBN_read'
- split previous '#ifndef RSOILWAT' version of function 'calculate_CO2_multipliers' up into its two parts: (1) read data from file --> code copied to 'SW_CBN_read' (2) calculate CO2 multipliers --> code merged with '#ifdef RSOILWAT' version of function 'calculate_CO2_multipliers' - nonsensical CO2 value check "ppm < 0.1 && ppm > -0.1" replaced with "LT(ppm, 0.)" in function 'calculate_CO2_multipliers'
Configuration menu - View commit details
-
Copy full SHA for bdb5afa - Browse repository at this point
Copy the full SHA bdb5afaView commit details -
Configuration menu - View commit details
-
Copy full SHA for 08ae6cd - Browse repository at this point
Copy the full SHA 08ae6cdView commit details -
Fix SW_CBN_read: module-level MyFileName must exist
Previously, the module-level variable 'MyFileName' was only created if not RSOILWAT, but the new function 'SW_CBN_read' needs this variable whether or not RSOILWAT
Configuration menu - View commit details
-
Copy full SHA for c7ec0b6 - Browse repository at this point
Copy the full SHA c7ec0b6View commit details -
Configuration menu - View commit details
-
Copy full SHA for 6434458 - Browse repository at this point
Copy the full SHA 6434458View commit details -
Clean up warnings with C function registration for rSOILWAT2
- variable 'CEntries' was not initialized properly because we don't have a .C() call in rSOILWAT2
Configuration menu - View commit details
-
Copy full SHA for 6117125 - Browse repository at this point
Copy the full SHA 6117125View commit details
Commits on Nov 18, 2017
-
- addressing issue #33 - defined macro for printing so that we can write `swprintf(format, ...)` whether we are compiling with RSOILWAT flag or for standalone SOILWAT2
Configuration menu - View commit details
-
Copy full SHA for dcc320c - Browse repository at this point
Copy the full SHA dcc320cView commit details -
Clarify init function and define cleanly input functions
- function 'SW_CTL_init_model' no longer calls '_read_inputs' so that we can call it inside the function 'onGetInputDataFromFiles' for initialization only - renamed '_read_inputs' to 'SW_CTL_obtain_inputs' - defined 'SW_CTL_read_inputs_from_disk'
Configuration menu - View commit details
-
Copy full SHA for 1349674 - Browse repository at this point
Copy the full SHA 1349674View commit details -
Work towards fixing 'onSet_swCarbon'
- GET_SLOT(object, install("CO2ppm")) is a vector of length 2 where the first element is the vector of years and the second element are the CO2 values. - n = length is now correctly calculated - but finding the correct year and extracting the data still fail
Configuration menu - View commit details
-
Copy full SHA for f116865 - Browse repository at this point
Copy the full SHA f116865View commit details -
Configuration menu - View commit details
-
Copy full SHA for a2d9737 - Browse repository at this point
Copy the full SHA a2d9737View commit details -
- code compiles for RSOILWAT, but likely crashes during run-time - handle S4 class object by coercing to vectors: '*years' and '*CO2ppm' - fixed logic of loop to locate index of first year for which we need CO2 data --> if we found the index of the year then 'break' (instead of 'continue') otherwise increment index - fixed logic of check that we have enough data --> we need at least index plus number of simulation years of available data (and not 'c->addtl_yr') - fixed logic of loop to copy CO2 concentration values to SOILWAT variable --> make sure that we don't overflow either the index nor the maximal number of CO2 years
Configuration menu - View commit details
-
Copy full SHA for 2e22144 - Browse repository at this point
Copy the full SHA 2e22144View commit details -
Make sure that function 'SW_SIT_read' reads carbon settings properly
- added debug print statements - aligned inputting of c->use_bio_mult, c->use_wue_mult, and c->scenario with other code in the function
Configuration menu - View commit details
-
Copy full SHA for 84b3de6 - Browse repository at this point
Copy the full SHA 84b3de6View commit details -
- close DrylandEcology/rSOILWAT2#77 - The function 'onGet_SW_CARBON' did not copy the values of the C variable `SW_Carbon` into a new created R-typed (S4-classed rSOILWAT2) variable representation. - fix condition of loop to copy CO2 values in function 'onSet_swCarbon'
Configuration menu - View commit details
-
Copy full SHA for 152d0dc - Browse repository at this point
Copy the full SHA 152d0dcView commit details -
Explain index of struct 'SW_CARBON'
explain how calendar years are represented
Configuration menu - View commit details
-
Copy full SHA for 5ba8d32 - Browse repository at this point
Copy the full SHA 5ba8d32View commit details -
- fix column names of CO2ppm matrix - also copy 'Scenario' name to C representation - use a dedicated SEXP variable 'CO2ppm' to copy the content of the S4 class slot of same name and convert to a real vector 'values' (which can now easily be accessed) - cleaner implementation of 'Locate index of first year' - fix logic of 'Check that we have enough data' (i is base1 here) -
Configuration menu - View commit details
-
Copy full SHA for d6d58de - Browse repository at this point
Copy the full SHA d6d58deView commit details
Commits on Nov 20, 2017
-
Updated comments that reference CO2 is 360 ppm
- contributing to issue #59
Configuration menu - View commit details
-
Copy full SHA for ef9e3a4 - Browse repository at this point
Copy the full SHA ef9e3a4View commit details -
Configuration menu - View commit details
-
Copy full SHA for cae7df8 - Browse repository at this point
Copy the full SHA cae7df8View commit details -
Configuration menu - View commit details
-
Copy full SHA for cb4bf87 - Browse repository at this point
Copy the full SHA cb4bf87View commit details
Commits on Nov 21, 2017
-
Configuration menu - View commit details
-
Copy full SHA for 521b8e5 - Browse repository at this point
Copy the full SHA 521b8e5View commit details
Commits on Nov 22, 2017
-
Configuration menu - View commit details
-
Copy full SHA for 1eeaa85 - Browse repository at this point
Copy the full SHA 1eeaa85View commit details
Commits on Nov 24, 2017
-
Configuration menu - View commit details
-
Copy full SHA for b6c3263 - Browse repository at this point
Copy the full SHA b6c3263View commit details
Commits on Nov 27, 2017
-
Configuration menu - View commit details
-
Copy full SHA for 179f83b - Browse repository at this point
Copy the full SHA 179f83bView commit details -
Fix multiple definitions of global variable 'SW_Carbon'
- The global variable 'SW_Carbon' is defined in 'SW_Carbon.c'. - Instead of being externed, it was re-defined in 'SW_Flow_lib.c', 'SW_Flow.c', 'SW_Site.c', and 'SW_VegProd.c'. - Similar bug fix for variables 'SW_VegProd' and 'SW_Model' in file 'SW_Carbon.c'
1Configuration menu - View commit details
-
Copy full SHA for 392e88b - Browse repository at this point
Copy the full SHA 392e88bView commit details -
New file SW_Output_mock.c for unit tests
- until we resolve issue #85, we need the functions from 'SW_Output.c' defined alternatively - SW_Output_mock.c provides mock definitions for these functions - compiling unit tests with 'SW_Output_mock.c' allows us to include 'SW_Output.h' in our unit test files - note: I attempted to eliminate compile warnings (hence some weird code snippets), but one warning remains > SW_Output_mock.c:204:13: warning: unused function '_echo_outputs' [-Wunused-function] static void _echo_outputs(void)
Configuration menu - View commit details
-
Copy full SHA for 97d373b - Browse repository at this point
Copy the full SHA 97d373bView commit details -
- We need to initialize and take down SOILWAT2 variables by imitating 'SW_Main.c/main()' because SOILWAT2 uses (global) states. - To initialize the global SOILWAT2 variables, I set up the unit test code to read from the SOILWAT2-standalone input files contained in the folder 'testing/'.
Configuration menu - View commit details
-
Copy full SHA for d75eed9 - Browse repository at this point
Copy the full SHA d75eed9View commit details -
First attempt at unit testing 'SW_Carbon'
- new file with unit tests 'test_SW_Carbon.cc' - more unit tests to come > make test test_run c++ -Wall -Wextra -std=gnu++11 -L. -isystem googletest/googletest/include -pthread \ test/*.cc -o sw_test -lgtest -lSOILWAT2++ -lm ./sw_test [==========] Running 3 tests from 3 test cases. [----------] Global test environment set-up. [----------] 1 test from BetaGeneratorDeathTest [ RUN ] BetaGeneratorDeathTest.Errors [ OK ] BetaGeneratorDeathTest.Errors (8 ms) [----------] 1 test from BetaGeneratorDeathTest (8 ms total) [----------] 1 test from CarbonTest [ RUN ] CarbonTest.Constructor [ OK ] CarbonTest.Constructor (0 ms) [----------] 1 test from CarbonTest (0 ms total) [----------] 1 test from BetaGeneratorTest [ RUN ] BetaGeneratorTest.ZeroToOneOutput [ OK ] BetaGeneratorTest.ZeroToOneOutput (0 ms) [----------] 1 test from BetaGeneratorTest (0 ms total) [----------] Global test environment tear-down [==========] 3 tests from 3 test cases ran. (8 ms total) [ PASSED ] 3 tests.
Configuration menu - View commit details
-
Copy full SHA for aa6a51f - Browse repository at this point
Copy the full SHA aa6a51fView commit details -
Update README to reflect changes in makefile
- commit 71258d2 introduced new make targets
Configuration menu - View commit details
-
Copy full SHA for 32b18fd - Browse repository at this point
Copy the full SHA 32b18fdView commit details
Commits on Nov 28, 2017
-
Fixes to function 'SW_CBN_read'
- The file was not closed after it was opened. - added 'debug' variable - use 'EQ' instead of testing a floating-point number against exact equality to 1 - declare and initialize variables only after code has exited if no multiplier is turned on
Configuration menu - View commit details
-
Copy full SHA for 21b3768 - Browse repository at this point
Copy the full SHA 21b3768View commit details -
Complete unit tests for SW_Carbon functionality
- close #63 [----------] 4 tests from CarbonTest [ RUN ] CarbonTest.Constructor [ OK ] CarbonTest.Constructor (0 ms) [ RUN ] CarbonTest.ReadInputFile [ OK ] CarbonTest.ReadInputFile (0 ms) [ RUN ] CarbonTest.CO2multipliers [ OK ] CarbonTest.CO2multipliers (1 ms) [ RUN ] CarbonTest.BiomassCO2effect [ OK ] CarbonTest.BiomassCO2effect (0 ms) [----------] 4 tests from CarbonTest (1 ms total)
Configuration menu - View commit details
-
Copy full SHA for 8e17910 - Browse repository at this point
Copy the full SHA 8e17910View commit details
Commits on Nov 29, 2017
-
- close #20 - makefile gained targets to estimate code coverage * 'make cov' = same as 'make test' but with code coverage support * 'make cov_run' = run unit tests and gcov on each source file (which were in a previous step compiled with 'make cov') - new bash script 'run_gcov.sh' which executes 'gcov' for each source file; used by 'make cov_run' - updated travis-ci yml to run code coverage unit tests and connect to 'codecov' server
Configuration menu - View commit details
-
Copy full SHA for 76af7c5 - Browse repository at this point
Copy the full SHA 76af7c5View commit details -
Improve travis-ci run of code coverage
- don't execute 'gcov' for unit test code or 'googletest' submodule - 'codecov' will run 'gcov' so that we can use 'make test_run' instead of 'make cov_run'
Configuration menu - View commit details
-
Copy full SHA for c29f726 - Browse repository at this point
Copy the full SHA c29f726View commit details -
- remove 'test' dependency of target 'test_run' so that we can call on travis-ci 'make cov test_run' where 'test_run' calls the binary produced by 'cov' and doesn't first compile and overwrite a non-coverage version of the binary
Configuration menu - View commit details
-
Copy full SHA for 5131e10 - Browse repository at this point
Copy the full SHA 5131e10View commit details -
Moved documentation files to 'doc/'
- moved old/outdated code change file to 'doc/' - moved bibtex library to 'doc/' and updated 'Doxyfile'
Configuration menu - View commit details
-
Copy full SHA for 3c71a59 - Browse repository at this point
Copy the full SHA 3c71a59View commit details -
Remove compiled documentation files from remote
- Remove content of `doc/html/` and only generate documentation locally - Added content of `doc/html/` to .gitignore - close #88
Configuration menu - View commit details
-
Copy full SHA for e84a3dc - Browse repository at this point
Copy the full SHA e84a3dcView commit details -
Re-organized variables: move variables to where others of same kind a…
…lready exist - variable 'key2obj' in 'SW_Output.c' contained one entry too many: removed one 'eVES' - moved variable 'addtl_yr' from 'SW_CARBON' to 'SW_MODEL' because it has nothing to do with atmospheric CO2 concentration but with simulation time - moved 'MAX_CO2_YEAR' from 'SW_Carbon.h' to 'SW_Defines.h' and renamed to 'MAX_NYEAR' - defined new variable 'simyear' in 'SW_MODEL' to avoid repeated calculation of 'year + addlt_yr' (e.g., all SW_Output.c/get_* functions use 'simyear') - 'SW_Carbon.h' define many vegetation variables even though this is about vegetation and not about [CO2] and despite that 'SW_VegProd.h' already deals with the functional types --> 'SW_VegProd.h' no longer needs to include 'SW_Carbon.h' * removed struct 'PTFs' (plant functional types) from 'SW_Carbon.h' * variable 'co2_multipliers' moved from 'SW_CARBON' to 'VegType' * function 'apply_CO2' moved from 'SW_Carbon.c' to 'SW_VegProd.c' and renamed to 'apply_biomassCO2effect' - cleaned up struct 'SW_VEGPROD' * defined struct 'VegTypeOut' and 'CoverType' - adjusted unit tests and moved vegetation-related tests to new file 'test_SW_VegProd.cc' - passes all unit tests: [==========] Running 7 tests from 4 test cases. [----------] Global test environment set-up. .... [----------] Global test environment tear-down [==========] 7 tests from 4 test cases ran. (8 ms total) [ PASSED ] 7 tests.
Configuration menu - View commit details
-
Copy full SHA for 2063e38 - Browse repository at this point
Copy the full SHA 2063e38View commit details -
Improve 'SW_CBN_read' and eliminate compile warnings
- function 'SW_CBN_read' gained check that 'year' inputs are not negative (values are used as index, hence negative values are not allowed). - eliminate compile warnings * warning: 'XXX' may be used uninitialized in this function [-Wmaybe-uninitialized] * warning: format ‘%d’ expects argument of type ‘int *’, but argument 3 has type ‘TimeInt *’ [-Wformat=]
Configuration menu - View commit details
-
Copy full SHA for f57240d - Browse repository at this point
Copy the full SHA f57240dView commit details -
Add debug print statements to 'SW_CBN_read'
- attempt to eliminate compile warnings
Configuration menu - View commit details
-
Copy full SHA for ea720d0 - Browse repository at this point
Copy the full SHA ea720d0View commit details -
Fix function 'SW_CTL_obtain_inputs'
- function 'SW_CTL_obtain_inputs' was supposed to call `calculate_CO2_multipliers()` which it did in the past - commit 6db701f removed the call to `calculate_CO2_multipliers()` at the end of the function `SW_CTL_obtain_inputs` previously named `_read_inputs` without replacing it -- for some reason (that I don't understand) git blame and diffs don't show this line being deleted by this commit
Configuration menu - View commit details
-
Copy full SHA for d3c8522 - Browse repository at this point
Copy the full SHA d3c8522View commit details -
Configuration menu - View commit details
-
Copy full SHA for 0166500 - Browse repository at this point
Copy the full SHA 0166500View commit details
Commits on Nov 30, 2017
-
Unit tests: properly reset global states
- the order in which tests are executed is not fixed - each TEST() must carefully reset global states -- this is a pain because our old SOILWAT2 c code is rich in functions that manipulate global states
Configuration menu - View commit details
-
Copy full SHA for bf4826c - Browse repository at this point
Copy the full SHA bf4826cView commit details -
Configuration menu - View commit details
-
Copy full SHA for 4175066 - Browse repository at this point
Copy the full SHA 4175066View commit details -
- `REvprintf()` returns void unlike `vfprintf()`; thus we cannot check for EOF
Configuration menu - View commit details
-
Copy full SHA for d787ce0 - Browse repository at this point
Copy the full SHA d787ce0View commit details -
- function `LogError` should only be called with argument `logfp` and no longer with `stderr` or `stdout` directly (see commit 4e0cc0e)
Configuration menu - View commit details
-
Copy full SHA for fe029d6 - Browse repository at this point
Copy the full SHA fe029d6View commit details -
Fix output for CO2-effect related variables
- close DrylandEcology/rSOILWAT2#78 - close DrylandEcology/rSOILWAT2#73 - file 'testing/Input/outsetup_v31.in' * fully explain what output columns are * rename output file to 'vegetation' from 'co2_effects' - function '_collect_values()' did not call `SW_OUT_sum_today(eVPD)` - return value of function 'get_co2effects' was 'void' instead of 'static void' as every other 'get_*' function - function 'SW_OUT_flush' did not call `SW_OUT_sum_today(eVPD)` - function 'sumof_vpd' only ever added biomass values into output slots from 'Today' which is 1 -- the correct index is 'SW_Model.doy' - function 'average_for' precluded 'ObjType's other than 'eSWC' and 'eWTH' to perform averaging
Configuration menu - View commit details
-
Copy full SHA for 48b586b - Browse repository at this point
Copy the full SHA 48b586bView commit details -
Configuration menu - View commit details
-
Copy full SHA for c243ec3 - Browse repository at this point
Copy the full SHA c243ec3View commit details -
'nullptr' is c++11 which is not good for rSOILWAT2
- replace 'nullptr' with 'NULL'
Configuration menu - View commit details
-
Copy full SHA for cff992a - Browse repository at this point
Copy the full SHA cff992aView commit details -
Configuration menu - View commit details
-
Copy full SHA for 69da0d9 - Browse repository at this point
Copy the full SHA 69da0d9View commit details -
Configuration menu - View commit details
-
Copy full SHA for f029b38 - Browse repository at this point
Copy the full SHA f029b38View commit details -
- addressing issue DrylandEcology/rSOILWAT2#81 - define 'OBJECTS' and 'SOURCES' for rSOILWAT2 compilation
Configuration menu - View commit details
-
Copy full SHA for bb34a97 - Browse repository at this point
Copy the full SHA bb34a97View commit details
Commits on Dec 1, 2017
-
1
Configuration menu - View commit details
-
Copy full SHA for 5387c0d - Browse repository at this point
Copy the full SHA 5387c0dView commit details -
More detailed explanation in prodin comments for CO2 effects
Coefficients assume that monthly biomass inputs reflect values for conditions at 360 ppm CO2, i.e., Coeff1 * x^Coeff2 = 1 for x = 360 CO2 ppm
Configuration menu - View commit details
-
Copy full SHA for 613db62 - Browse repository at this point
Copy the full SHA 613db62View commit details -
Move rSOILWAT2 files and makefile targets to rSOILWAT2/src/
- addressing DrylandEcology/rSOILWAT2#81 and DrylandEcology/rSOILWAT2#66 - Makevars, SW_R_init.c, SW_R_lib.c, and SW_R_lib.h are not used by SOILWAT2 -- they are rSOILWAT2 files - remove rSOILWAT2 shared object target from makefile --> this commit requires that the removed files are added to rSOILWAT2/src/ and that the source code of SOILWAT2 is now a submodule in rSOILWAT2/src/SOILWAT2/ -- instead of rSOILWAT2/src/
Configuration menu - View commit details
-
Copy full SHA for 39e23c9 - Browse repository at this point
Copy the full SHA 39e23c9View commit details
Commits on Dec 2, 2017
-
Fix fatal crash that occured when trying to send a specific error mes…
…sage Also, i was a high number because the simstart year was 1979 and only data for 1980-2010 was provided, so the loop iterated i many times.
1Configuration menu - View commit details
-
Copy full SHA for 48f3588 - Browse repository at this point
Copy the full SHA 48f3588View commit details -
Fix end of loop in 'onSet_swCarbon'
If the 'values' object doesn't contain the value of 'year', then the loop was not behaving properly and didn't stop until 'i' was extremely large. Fix: add condition that i remains less than maximum number of years. This and commit 48f3588 close DrylandEcology/rSOILWAT2#80
Configuration menu - View commit details
-
Copy full SHA for 005b658 - Browse repository at this point
Copy the full SHA 005b658View commit details
Commits on Dec 5, 2017
-
Configuration menu - View commit details
-
Copy full SHA for 21f1bbf - Browse repository at this point
Copy the full SHA 21f1bbfView commit details
Commits on Dec 8, 2017
-
Configuration menu - View commit details
-
Copy full SHA for 4217f97 - Browse repository at this point
Copy the full SHA 4217f97View commit details -
Merge branch 'master' into soilwat_co2_effects
# Conflicts: # SW_Output.c # SW_Site.c # generic.c # makefile # testing/Input/siteparam.in # testing/Input/veg.in # testing/Input/years.in # testing/files_v31.in
Configuration menu - View commit details
-
Copy full SHA for 188fc58 - Browse repository at this point
Copy the full SHA 188fc58View commit details -
Configuration menu - View commit details
-
Copy full SHA for 2d8944d - Browse repository at this point
Copy the full SHA 2d8944dView commit details
Commits on Dec 11, 2017
-
Configuration menu - View commit details
-
Copy full SHA for 51d03e4 - Browse repository at this point
Copy the full SHA 51d03e4View commit details -
Merge branch 'master' into soilwat_co2_effects
# Conflicts: # SW_Output.c
Configuration menu - View commit details
-
Copy full SHA for 8204258 - Browse repository at this point
Copy the full SHA 8204258View commit details
Commits on Dec 13, 2017
-
Configuration menu - View commit details
-
Copy full SHA for 522ac34 - Browse repository at this point
Copy the full SHA 522ac34View commit details -
Configuration menu - View commit details
-
Copy full SHA for 61cca29 - Browse repository at this point
Copy the full SHA 61cca29View commit details
Commits on Dec 14, 2017
-
Close #96: Add 'Default' scenario to carbon.in
siteparam.in still uses RCP85 by default
Configuration menu - View commit details
-
Copy full SHA for 8eb69d2 - Browse repository at this point
Copy the full SHA 8eb69d2View commit details