Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Stepwat soilwat output new may #44

Merged
merged 115 commits into from
Apr 6, 2018
Merged

Stepwat soilwat output new may #44

Show file tree
Hide file tree
Changes from 86 commits
Commits
Show all changes
115 commits
Select commit Hold shift + click to select a range
3f7b85b
Changes for adding Soilwat var output in stepwat location for all ite…
ashishtiwari2006 May 10, 2017
a0666c9
more changes
ashishtiwari2006 May 10, 2017
c029939
Altered code to create proper format for soilwat CSV
BrendenBe1 Jun 14, 2017
ffb2bb0
Changed SOILWAT output csv layout to always have max layers
BrendenBe1 Jun 14, 2017
0ce363a
Added vars to sxw struct to hold SOILWAT outputs
BrendenBe1 Jun 15, 2017
2e188ec
Changed _make_header_for_soilwat to take input for amount of columns …
BrendenBe1 Jun 19, 2017
961eb6d
Passed prod.in values to struct and fixed SWC values in csv
BrendenBe1 Jun 28, 2017
afe7fb8
changes for file creation for proper output
BrendenBe1 Jul 5, 2017
3c4e041
add timestep line to outsetup.in
BrendenBe1 Jul 6, 2017
7ba59be
Finished SWC -> SWA conversion
BrendenBe1 Jul 11, 2017
dcba03b
changes for proper file output
BrendenBe1 Jul 12, 2017
8e44ffd
Changes to some .in files
BrendenBe1 Jul 17, 2017
8fc885e
Error checking SWA conversion
BrendenBe1 Jul 18, 2017
fcff25b
Continuing to create timestep files
BrendenBe1 Jul 20, 2017
2dafb16
Adding function to apply SWA values
BrendenBe1 Aug 3, 2017
0b9a8e1
_SWA_contribution_by_group function progress
BrendenBe1 Aug 7, 2017
beb78e2
_SWA_contribution_by_group function progress
BrendenBe1 Aug 9, 2017
9be94d6
Updated _SWA_contribution_by_group to partition space correctly
BrendenBe1 Aug 15, 2017
583488d
Change -o flag to write outputs as STEPPE is running
BrendenBe1 Aug 17, 2017
d854199
Change -o flag to write outputs as STEPPE is running
BrendenBe1 Aug 17, 2017
cbcf7d2
Altering how -o flag in STEPPE interacts with SOILWAT
BrendenBe1 Aug 23, 2017
bb44cf6
Altering how -o flag in STEPPE interacts with SOILWAT
BrendenBe1 Aug 23, 2017
689c0ec
Implemented stepwat_transp_test into this branch and started working …
BrendenBe1 Aug 24, 2017
9b8ed09
Implementing SOILWAT variables being averaged over all iterations
BrendenBe1 Aug 28, 2017
09f2007
Continuing to work on averaging iterations and swa contribution
BrendenBe1 Aug 30, 2017
7bddbf1
Calculated SWX.transp_SWA for use in downstream functions
BrendenBe1 Sep 6, 2017
1c93dc7
Passed new resource values to downstream functions
BrendenBe1 Sep 8, 2017
1768759
Added input flag for storing output for every iteration
BrendenBe1 Sep 8, 2017
98239bd
Working on issue #23, average over iterations
BrendenBe1 Sep 11, 2017
7e35ff2
Working on issue #23, average over iterations
BrendenBe1 Sep 15, 2017
b652122
Merge branch 'master' into stepwat_soilwat_output_new_may
BrendenBe1 Sep 18, 2017
9a94eb5
Commented out code for -i flag due to bug
BrendenBe1 Sep 18, 2017
6fe0983
Working on averaging output values over all iterations
BrendenBe1 Sep 20, 2017
6952445
Working on averaging output values over all iterations
BrendenBe1 Sep 22, 2017
9e4bd86
Working on averaging output values over all iterations
BrendenBe1 Sep 26, 2017
24a9b9d
Resolving Memory Error in Iteration Average Storage
BrendenBe1 Sep 27, 2017
595f5af
Resolving Memory Error in Iteration Average Storage
BrendenBe1 Sep 27, 2017
0fc92d1
Overhaul SWAbulk arrays
BrendenBe1 Sep 29, 2017
1764e56
-i flag is functional (outputs data for each individual iteration)
BrendenBe1 Oct 4, 2017
27e5b58
Calculating dSWAbulk for use in _SWA_contribution_by_group
BrendenBe1 Oct 6, 2017
cb93bd8
Able to use -o & -i flags together
BrendenBe1 Oct 10, 2017
a4be8be
Added index to SWA_master and dSWAbulk for critical value
BrendenBe1 Oct 13, 2017
e1e3b9b
Working on correcting a memory error
BrendenBe1 Oct 18, 2017
ba6b4c9
Working on correcting a memory error
BrendenBe1 Oct 19, 2017
f90e446
Working on calculating dSWAbulk to get actual soil water available
BrendenBe1 Oct 20, 2017
7f11343
Working on calculating dSWAbulk to get actual soil water available
BrendenBe1 Oct 23, 2017
80b6341
Working on correcting a memory error
BrendenBe1 Oct 25, 2017
9c817c6
Finished function to calculate dSWAbulk
BrendenBe1 Oct 25, 2017
b02ae4f
Updating sw_src subrepo to correct branch and recent commits
BrendenBe1 Oct 30, 2017
f390a4b
Redistributing available soilwater in get_dSWAbulk (soilwat function)…
BrendenBe1 Oct 30, 2017
c5e0678
Working on issue in sw_src/SW_Output.c where a call to get_dSWAbulk c…
BrendenBe1 Nov 2, 2017
5e94de0
fixed issue with output not being written to file when get_dSWAbulk w…
BrendenBe1 Nov 3, 2017
2b53b06
Changes to get_dSWAbulk to fix occasional out of bounds error
BrendenBe1 Nov 13, 2017
e751a3d
Updated structures to work with SOILWAT standalone for calculating dS…
BrendenBe1 Nov 13, 2017
99440a5
Summed up repartitioned soilwater
BrendenBe1 Nov 16, 2017
d21123a
Using sum_dSWA_repartitioned values in sxw_resource.c
BrendenBe1 Nov 17, 2017
e970e8c
Changes to sxw_resource.c
BrendenBe1 Nov 27, 2017
10d1944
Working on getting values to correctly average over all iterations
BrendenBe1 Nov 28, 2017
af198f6
Changed the output format for STEPPE. Now the values are only output …
BrendenBe1 Nov 29, 2017
0435537
Average of value over all iterations is fully functional and ammended…
BrendenBe1 Dec 1, 2017
e72e1d9
Average of value over all iterations is fully functional and ammended…
BrendenBe1 Dec 1, 2017
ed6536f
Added print statements for testing
BrendenBe1 Dec 4, 2017
92433b1
Added print statements for testing
BrendenBe1 Dec 4, 2017
e37b3a7
Fixed error in sum_dSWA_repartitioned calculation. Needed to reset th…
BrendenBe1 Dec 4, 2017
0dbd15d
Moving call to _res_part_extra into the block where SOILWAT is not be…
BrendenBe1 Dec 4, 2017
2671c72
Replaced SWA with sum_dSWA_repartitioned in the output file
BrendenBe1 Dec 6, 2017
95dde83
-i and -o flags work together and standard deviation is being output …
BrendenBe1 Dec 11, 2017
fd34993
Fixed seg fault when running with -o flag
BrendenBe1 Dec 15, 2017
4d59848
updated transp&SWA_contribution_by_group #56
Dec 15, 2017
62784bb
Resolved SOILWAT issue #112. All SOILWAT variables are now available …
BrendenBe1 Dec 20, 2017
01ba852
Resolved Issue #111. subfolder has been changed from 'csv' to 'sw_out…
BrendenBe1 Dec 20, 2017
e4a0eef
Resolving SOILWAT issue #110. Using updated fractional values instead…
BrendenBe1 Jan 8, 2018
9e7e0b7
Potentially resolving issue #57 dealing with memory leak. Also added …
BrendenBe1 Jan 8, 2018
76d4958
Closing files to resolve issue #59
BrendenBe1 Jan 8, 2018
0e5eafc
Removed useVegType array and replaced all usage with the proper fract…
BrendenBe1 Jan 9, 2018
d1b2140
Added flag to outsetup_v30.in file to use timestep or not. Resolution…
BrendenBe1 Jan 9, 2018
3207568
Continued work on issue #58
BrendenBe1 Jan 9, 2018
eb45d5a
Potential resolution to memory issue
BrendenBe1 Jan 10, 2018
c97615c
Working on SOILWAT issue #127 where SWA values are 0 in output files.
BrendenBe1 Jan 10, 2018
3faa61b
Issue #120. Added another param to the output variables to avoid inde…
BrendenBe1 Jan 10, 2018
958fd6f
SOILWAT Issue #120. Fixed issue with values not being written for oth…
BrendenBe1 Jan 10, 2018
8a07982
Updating description of outsetup_v30.in
Jan 11, 2018
a2a1275
Working on SOIWLAT issue #125. For SOILWAT issue #125 functionality f…
BrendenBe1 Jan 11, 2018
a760a0b
Added function declarations to SW_Output.h to solve compile error.
BrendenBe1 Jan 11, 2018
cd0c7d7
Merge branch 'master' into stepwat_soilwat_output_new_may
BrendenBe1 Jan 17, 2018
75b04c5
Merge branch 'master' into stepwat_soilwat_output_new_may
BrendenBe1 Jan 18, 2018
44e33b2
Added memory for Carbon outputs and added timestep checks for proper …
BrendenBe1 Jan 18, 2018
bad1a71
Added call to free memory at end of run. Removed hardocoded values an…
BrendenBe1 Jan 19, 2018
0f6514d
Altering STEPPE variables to comply with the SOILWAT issue #131 so ST…
BrendenBe1 Jan 19, 2018
ba99709
Changes for STEPPE specific code in SW_Output.c to fix problem with U…
BrendenBe1 Jan 19, 2018
abce9d7
merged sw_src with master
BrendenBe1 Jan 23, 2018
762a1a2
Merged sw_src with master to overhaul veg arrays. Also changed functi…
BrendenBe1 Jan 23, 2018
85211fd
master merged into sw_src dealing with water balance
BrendenBe1 Jan 25, 2018
cd63a53
Updated vegetation in ST_grid.c to be arrays
BrendenBe1 Jan 25, 2018
8a7affa
Moved running_avg and running_std functions to ST_Stats.c from SW_Out…
BrendenBe1 Jan 25, 2018
c874225
Changed order of veg types to match the veg types defined in SOILWAT
BrendenBe1 Jan 26, 2018
29612ec
Changed swTRUE and swFALSE back to TRUE and FALSE. Removed hardcoded …
BrendenBe1 Feb 1, 2018
cbc5c9f
Changed struct name Sw_File_Status to SW_File_Status. Fixed an issue …
BrendenBe1 Feb 1, 2018
ce3b1e1
Resolving issues in SOILWAT and changing minor things to work with th…
BrendenBe1 Feb 2, 2018
2c8c28d
Removed the line USE_TIMESTEP from the outsetup.in file and removed s…
BrendenBe1 Feb 2, 2018
5d6ad4c
Resolving issues #73 and #78.
BrendenBe1 Feb 6, 2018
29502a0
removed extra functions added back in accidentally
Feb 6, 2018
cc63437
Resolving SOILWAT issue #160 and working on SOILWAT issue #157. For S…
BrendenBe1 Feb 8, 2018
f97bef6
Working on SOILWAT issue #157 with moving the location of the SWA cal…
BrendenBe1 Feb 9, 2018
b1af89e
Removing struct variables and memory allocation that is no longer nee…
BrendenBe1 Feb 13, 2018
0b8c3cd
provided comments for SWA issue#152
Feb 22, 2018
8df482a
Resolving issue #87. Added extra index to the avg variables to keep t…
BrendenBe1 Mar 13, 2018
996656c
Merge remote-tracking branch 'origin/stepwat_soilwat_output_new_may' …
BrendenBe1 Mar 13, 2018
46db1c8
Dealing with some compiler warnings
BrendenBe1 Mar 15, 2018
fe3a132
Added average and standard deviation for precip values (ppt, rain, sn…
BrendenBe1 Mar 16, 2018
e4a2480
Resolving issue #98, First entry in yearly output files is no longer …
BrendenBe1 Mar 27, 2018
23adcf8
Dealing with compiler warnings. Down to 11 warnings originating in ST…
BrendenBe1 Mar 29, 2018
1e01b0f
Updating submodule. New SOILWAT commits add description for how to ma…
BrendenBe1 Mar 30, 2018
a991ab9
Updating submodule
BrendenBe1 Apr 6, 2018
27f82d6
Updating submodule to point to SOILWAT2 master.
BrendenBe1 Apr 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
102 changes: 26 additions & 76 deletions .cproject
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,87 +1,40 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
<storageModule moduleId="org.eclipse.cdt.core.settings">
<cconfiguration id="cdt.managedbuild.config.gnu.exe.debug.1607003796">
<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.exe.debug.1607003796" moduleId="org.eclipse.cdt.core.settings" name="Debug">
<cconfiguration id="cdt.managedbuild.toolchain.gnu.base.1960962802">
<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.toolchain.gnu.base.1960962802" moduleId="org.eclipse.cdt.core.settings" name="Default">
<externalSettings/>
<extensions>
<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.GNU_ELF" point="org.eclipse.cdt.core.BinaryParser"/>
<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
</extensions>
</storageModule>
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
<configuration artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.exe.debug.1607003796" name="Debug" parent="cdt.managedbuild.config.gnu.exe.debug">
<folderInfo id="cdt.managedbuild.config.gnu.exe.debug.1607003796." name="/" resourcePath="">
<toolChain id="cdt.managedbuild.toolchain.gnu.exe.debug.1361537213" name="Linux GCC" nonInternalBuilderId="cdt.managedbuild.target.gnu.builder.exe.debug" superClass="cdt.managedbuild.toolchain.gnu.exe.debug">
<targetPlatform id="cdt.managedbuild.target.gnu.platform.exe.debug.1008485144" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.exe.debug"/>
<builder autoBuildTarget="" cleanBuildTarget="" id="cdt.managedbuild.target.gnu.builder.exe.debug.1682504821" incrementalBuildTarget="" managedBuildOn="false" name="Gnu Make Builder" superClass="cdt.managedbuild.target.gnu.builder.exe.debug"/>
<tool id="cdt.managedbuild.tool.gnu.archiver.base.1371181892" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.1846539947" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug">
<option id="gnu.cpp.compiler.exe.debug.option.optimization.level.1975205701" name="Optimization Level" superClass="gnu.cpp.compiler.exe.debug.option.optimization.level" value="gnu.cpp.compiler.optimization.level.none" valueType="enumerated"/>
<option id="gnu.cpp.compiler.exe.debug.option.debugging.level.177677920" name="Debug Level" superClass="gnu.cpp.compiler.exe.debug.option.debugging.level" value="gnu.cpp.compiler.debugging.level.max" valueType="enumerated"/>
</tool>
<tool id="cdt.managedbuild.tool.gnu.c.compiler.exe.debug.1430961906" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.exe.debug">
<option defaultValue="gnu.c.optimization.level.none" id="gnu.c.compiler.exe.debug.option.optimization.level.1431451492" name="Optimization Level" superClass="gnu.c.compiler.exe.debug.option.optimization.level" valueType="enumerated"/>
<option id="gnu.c.compiler.exe.debug.option.debugging.level.925072886" name="Debug Level" superClass="gnu.c.compiler.exe.debug.option.debugging.level" value="gnu.c.debugging.level.max" valueType="enumerated"/>
<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.699315166" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
</tool>
<tool id="cdt.managedbuild.tool.gnu.c.linker.exe.debug.835457649" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.exe.debug">
<inputType id="cdt.managedbuild.tool.gnu.c.linker.input.1806645412" superClass="cdt.managedbuild.tool.gnu.c.linker.input">
<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
<additionalInput kind="additionalinput" paths="$(LIBS)"/>
</inputType>
</tool>
<tool id="cdt.managedbuild.tool.gnu.cpp.linker.exe.debug.1100360489" name="GCC C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.exe.debug"/>
<tool id="cdt.managedbuild.tool.gnu.assembler.exe.debug.57964375" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.exe.debug">
<inputType id="cdt.managedbuild.tool.gnu.assembler.input.1598837039" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
</tool>
</toolChain>
</folderInfo>
</configuration>
</storageModule>
<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
</cconfiguration>
<cconfiguration id="cdt.managedbuild.config.gnu.exe.release.1995299128">
<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.exe.release.1995299128" moduleId="org.eclipse.cdt.core.settings" name="Release">
<externalSettings/>
<extensions>
<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
</extensions>
</storageModule>
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
<configuration artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.exe.release.1995299128" name="Release" parent="cdt.managedbuild.config.gnu.exe.release">
<folderInfo id="cdt.managedbuild.config.gnu.exe.release.1995299128." name="/" resourcePath="">
<toolChain id="cdt.managedbuild.toolchain.gnu.exe.release.1653370910" name="Linux GCC" superClass="cdt.managedbuild.toolchain.gnu.exe.release">
<targetPlatform id="cdt.managedbuild.target.gnu.platform.exe.release.1948547441" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.exe.release"/>
<builder buildPath="${workspace_loc:/StepWat}/Release" id="cdt.managedbuild.target.gnu.builder.exe.release.1943294008" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" superClass="cdt.managedbuild.target.gnu.builder.exe.release"/>
<tool id="cdt.managedbuild.tool.gnu.archiver.base.1755164264" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.exe.release.685533637" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.exe.release">
<option id="gnu.cpp.compiler.exe.release.option.optimization.level.1656950176" name="Optimization Level" superClass="gnu.cpp.compiler.exe.release.option.optimization.level" value="gnu.cpp.compiler.optimization.level.most" valueType="enumerated"/>
<option id="gnu.cpp.compiler.exe.release.option.debugging.level.1305274640" name="Debug Level" superClass="gnu.cpp.compiler.exe.release.option.debugging.level" value="gnu.cpp.compiler.debugging.level.none" valueType="enumerated"/>
<configuration buildProperties="" id="cdt.managedbuild.toolchain.gnu.base.1960962802" name="Default" parent="org.eclipse.cdt.build.core.emptycfg">
<folderInfo id="cdt.managedbuild.toolchain.gnu.base.1960962802.1899753262" name="/" resourcePath="">
<toolChain id="cdt.managedbuild.toolchain.gnu.base.60420888" name="Linux GCC" superClass="cdt.managedbuild.toolchain.gnu.base">
<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.GNU_ELF" id="cdt.managedbuild.target.gnu.platform.base.957318401" name="Debug Platform" osList="linux,hpux,aix,qnx" superClass="cdt.managedbuild.target.gnu.platform.base"/>
<builder id="cdt.managedbuild.target.gnu.builder.base.541207869" managedBuildOn="false" name="Gnu Make Builder.Default" superClass="cdt.managedbuild.target.gnu.builder.base"/>
<tool id="cdt.managedbuild.tool.gnu.archiver.base.1849092870" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.base.2024473342" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.base">
<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.502786035" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
</tool>
<tool id="cdt.managedbuild.tool.gnu.c.compiler.exe.release.964262083" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.exe.release">
<option defaultValue="gnu.c.optimization.level.most" id="gnu.c.compiler.exe.release.option.optimization.level.737386648" name="Optimization Level" superClass="gnu.c.compiler.exe.release.option.optimization.level" valueType="enumerated"/>
<option id="gnu.c.compiler.exe.release.option.debugging.level.547920808" name="Debug Level" superClass="gnu.c.compiler.exe.release.option.debugging.level" value="gnu.c.debugging.level.none" valueType="enumerated"/>
<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.898539391" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
<tool id="cdt.managedbuild.tool.gnu.c.compiler.base.327190143" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.base">
<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.443158716" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
</tool>
<tool id="cdt.managedbuild.tool.gnu.c.linker.exe.release.1693950626" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.exe.release">
<inputType id="cdt.managedbuild.tool.gnu.c.linker.input.294491668" superClass="cdt.managedbuild.tool.gnu.c.linker.input">
<tool id="cdt.managedbuild.tool.gnu.c.linker.base.366555753" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.base"/>
<tool id="cdt.managedbuild.tool.gnu.cpp.linker.base.2085128475" name="GCC C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.base">
<inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.1449232052" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
<additionalInput kind="additionalinput" paths="$(LIBS)"/>
</inputType>
</tool>
<tool id="cdt.managedbuild.tool.gnu.cpp.linker.exe.release.725985621" name="GCC C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.exe.release"/>
<tool id="cdt.managedbuild.tool.gnu.assembler.exe.release.601097030" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.exe.release">
<inputType id="cdt.managedbuild.tool.gnu.assembler.input.1379942011" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
<tool id="cdt.managedbuild.tool.gnu.assembler.base.2031969653" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.base">
<inputType id="cdt.managedbuild.tool.gnu.assembler.input.1173215307" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
</tool>
</toolChain>
</folderInfo>
Expand All @@ -90,9 +43,6 @@
<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
</cconfiguration>
</storageModule>
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
<project id="StepWat.cdt.managedbuild.target.gnu.exe.113587658" name="Executable" projectType="cdt.managedbuild.target.gnu.exe"/>
</storageModule>
<storageModule moduleId="scannerConfiguration">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.release.1995299128;cdt.managedbuild.config.gnu.exe.release.1995299128.;cdt.managedbuild.tool.gnu.c.compiler.exe.release.964262083;cdt.managedbuild.tool.gnu.c.compiler.input.898539391">
Expand All @@ -102,14 +52,14 @@
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
</scannerConfigBuildInfo>
</storageModule>
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
<project id="stepwat_new_output_may.null.1021303280" name="stepwat_new_output_may"/>
</storageModule>
<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
<storageModule moduleId="refreshScope" versionNumber="2">
<configuration configurationName="Debug">
<resource resourceType="PROJECT" workspacePath="/StepWat"/>
</configuration>
<configuration configurationName="Release">
<resource resourceType="PROJECT" workspacePath="/StepWat"/>
</configuration>
<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings">
<doc-comment-owner id="org.eclipse.cdt.internal.ui.text.doctools.NullDocCommentOwner">
<path value=""/>
</doc-comment-owner>
</storageModule>
<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
</cproject>
1 change: 1 addition & 0 deletions .project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,6 @@
<nature>org.eclipse.cdt.core.cnature</nature>
<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
<nature>org.eclipse.cdt.core.ccnature</nature>
</natures>
</projectDescription>
13 changes: 10 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,14 @@ Other tasks:
```

```
> Usage: stepwat [-d startdir] [-f files.in] [-q] [-s] [-e] [-o] [-g]
> Usage: stepwat [-d startdir] [-f files.in] [-q] [-s] [-e] [-o] [-i] [-g]
> -d : supply working directory (default=.)
> -f : supply list of input files (default=files.in)
> -q : quiet mode, don't print message to check logfile.
> -s : use SOILWAT model for resource partitioning.
> -e : echo initialization results to logfile
> -o : print all the soilwat output in addition to the stepwat output
> -o : write SOILWAT output to output files. Contains average over all iterations and standard deviation
> -i : write soilwat output to output files for each iteration
> -g : use gridded mode
```

Expand Down Expand Up @@ -68,6 +69,13 @@ cd testing.sagebrush.master/Stepwat_Inputs/
./stepwat -f files.in
```

* Run STEPPE (get SOILWAT output for all iterations and average)

```
cd testing.sagebrush.master/Stepwat_Inputs/
./stepwat -f files.in -o -i -s
```


<br>

Expand All @@ -79,4 +87,3 @@ Contributors are encouraged, however, to update local clones to [point to the ne
```
git remote set-url origin https://github.com/Burke-Lauenroth-Lab/STEPWAT2.git
```

17 changes: 8 additions & 9 deletions ST_environs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,11 @@ void Env_Generate( void) {
Int rg;

switch (UseSoilwat) {
case FALSE:
case swFALSE:
/* clear last year's leftover resources */
ForEachGroup(rg) RGroup[rg]->res_avail = 0.0;
break;
case TRUE:
case swTRUE:
SXW_Run_SOILWAT();
break;
}
Expand Down Expand Up @@ -90,7 +90,7 @@ static void _make_ppt( void) {
* but we still pass through this code to set the
* Dry/Wet/Normal state.
* KAP 1/26/2017 The above note by CB is not correct. Env.ppt
* is set in _sxw_set_environs, but gsppt is not, it is
* is set in _sxw_set_environs, but gsppt is not, it is
* set below. When using SOILWAT or not, the gsspt, ppt.dry,
* and ppt.wet is currently fixed each year and read from env.in
* We should consider calculating gsspt in the _sxw_set_environs
Expand Down Expand Up @@ -241,17 +241,17 @@ static void _make_disturbance( void) {
case FecalPat:
if (Plot.pat_removed) {
Plot.disturbed = 0;
Plot.pat_removed = FALSE;
Plot.pat_removed = swFALSE;
Plot.disturbance = NoDisturb;
} else {
pc = Globals.pat.recol[Slope] * Plot.disturbed
+ Globals.pat.recol[Intcpt];
if (RandUni() <= pc) {
Plot.pat_removed = TRUE;
Plot.pat_removed = swTRUE;
/* slight effects for one year*/
Plot.disturbed = 1;
} else {
Plot.pat_removed = FALSE;
Plot.pat_removed = swFALSE;
Plot.disturbed++;
}
}
Expand All @@ -272,15 +272,15 @@ static void _make_disturbance( void) {
event = (DisturbEvent) RandUniRange(1, LastDisturb -1);

/* make sure this is off unless needed */
Plot.pat_removed = FALSE;
Plot.pat_removed = swFALSE;
switch( event) {
case FecalPat:
if (!Globals.pat.use) {event=NoDisturb; break;}
event = (RandUni() <= Globals.pat.occur)
? event : NoDisturb;
if (event == NoDisturb) break;
Plot.pat_removed = (RandUni() <= Globals.pat.removal)
? TRUE : FALSE;
? swTRUE : swFALSE;
Plot.disturbed = 0;
break;
case AntMound:
Expand Down Expand Up @@ -308,4 +308,3 @@ static void _make_disturbance( void) {
}

}

Loading