gistfile1.txt

>git log --oneline --decorate --graph -n 10
* 11216be (HEAD -> jenn/gas-generation-reg-tests, origin/jenn/gas-generation-reg-tests) Added two regression tests for the WIPP_SOURCE_SINK gas/brine generation process model, one in serial and one in parallel.
* 873dcd9 Added an output regression test for the WIPP_SOURCE_SINK .pnl file.
* fc98c96 Added OUTPUT_START_TIME so that the start time of printing out the .pnl file can be controlled. I mostly added this so the output comparison regression test can have a clipped .pnl file.
* e10a477 Error message did not work in parallel for the check on rock density. Fix involved only checking where the region was local and also had to use printErrMsgByRank.
* 239339c Needed two rate_string variables, one for energy rates and one for mass or volumetric rates, because the internal unit string was remembering only the last rate, which is a problem in TH mode.
* f85d6a9 Fixed incorrect indexing of pressure array for eos gas testing.
* 7b4a89d Updated module dependencies.
*   c6979d4 Merge branch 'jenn/biosphere-regression-test'
|\  
| * 25d189a (origin/jenn/biosphere-regression-test) Updated the .bio.gold file because there was some weird stuff going on that a make clean on master fixed.
* |   5d55870 Merged in jenn/biosphere-regression-test (pull request #23)
|\ \  
| |/  

> git rebase master
First, rewinding head to replay your work on top of it...
Applying: Added OUTPUT_START_TIME so that the start time of printing out the .pnl file can be controlled. I mostly added this so the output comparison regression test can have a clipped .pnl file.
Applying: Added an output regression test for the WIPP_SOURCE_SINK .pnl file.
Applying: Added two regression tests for the WIPP_SOURCE_SINK gas/brine generation process model, one in serial and one in parallel.

>git log --oneline --decorate --graph -n 10
* 192bb84 (HEAD -> jenn/gas-generation-reg-tests) Added two regression tests for the WIPP_SOURCE_SINK gas/brine generation process model, one in serial and one in parallel.
* 1a31cae Added an output regression test for the WIPP_SOURCE_SINK .pnl file.
* 96acf3f Added OUTPUT_START_TIME so that the start time of printing out the .pnl file can be controlled. I mostly added this so the output comparison regression test can have a clipped .pnl file.
*   fc3fa40 (origin/master, origin/HEAD, master) Merged in jenn/wipp-cc-unit-tests (pull request #24)
|\  
| * 3537d83 Added a call to check CapillaryPressure as a function of low and high liquid saturation for each KRP# unit test.
| * 7f3b3f3 Added a unit test for KRP11 - the last one, but next I want to add a call the CapillaryPressure too.
| *   9b314c7 Merge branch 'jenn/wipp-cc-unit-tests' of https://bitbucket.org/pflotran/pflotran into jenn/wipp-cc-unit-tests
| |\  
| | * 17fb90b Added a unit test for KRP4 characteristic curve functions. Updated more truncating?
| | * dfaa60f Added a unit test for KRP2 and KRP3 characteristic curves. Discovered an error in how the saturation function was truncated (it wasn't being truncated at all) for KRP2 and KRP3, so I fixed it so the saturation is properly truncated.
| | * 292793e Not working for some reason. Sad face.

>git status
On branch jenn/gas-generation-reg-tests
Your branch and 'origin/jenn/gas-generation-reg-tests' have diverged,
and have 19 and 3 different commits each, respectively.
  (use "git pull" to merge the remote branch into yours)