Updates to the code and arrangement to directories, calibration version, etc. #14
Conversation
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
Not sure where these come into play. They don't seem to be imported anywhere, and I searched the codebase for references to them and can't find any.
This brings in changes that were present on the cluster in the /home/stuff/fengming/TEMmodules/DOSTEM1.2 folder as of 11/19/2012. These changes allow for including 4 tundras and 3 boreal forests. **NOTE**: The code may or may not run with the test files at this point -- the various config files need to be updated. Notes from Fengming's email: So, please remember that: vegetation ID has been changed as following: 0 – graminoid tundra; 1 – wet sedge tundra; 2 – shrub tundra; 3 – heather tundra; 4 – deciduous boreal forest; 5 – white spruce; and 6 – black spruce. This implies that you need to regenerate the "vegetation.nc" under cohort/eq/ for any cases. And still there are two drainage types for each vegetation types.
If source files are added, moved, or rearranged, then this Makefile will need to be updated by hand. Also the order of the -l flag seems to be important.
Copied over files from main version to calib. version to get Fenming's updates.
Not certain if the config/Test_calib.config is needed?
Not sure where these come into play. They don't seem to be imported anywhere, and I searched the codebase for references to them and can't find any.
This brings in changes that were present on the cluster in the /home/stuff/fengming/TEMmodules/DOSTEM1.2 folder as of 11/19/2012. These changes allow for including 4 tundras and 3 boreal forests. **NOTE**: The code may or may not run with the test files at this point -- the various config files need to be updated. Notes from Fengming's email: So, please remember that: vegetation ID has been changed as following: 0 – graminoid tundra; 1 – wet sedge tundra; 2 – shrub tundra; 3 – heather tundra; 4 – deciduous boreal forest; 5 – white spruce; and 6 – black spruce. This implies that you need to regenerate the "vegetation.nc" under cohort/eq/ for any cases. And still there are two drainage types for each vegetation types.
If source files are added, moved, or rearranged, then this Makefile will need to be updated by hand. Also the order of the -l flag seems to be important.
Copied over files from main version to calib. version to get Fenming's updates.
Not certain if the config/Test_calib.config is needed?
deleted all the conflicting files, since they are not needed with the new arrangement of the calibration build process... Conflicts: calibration/DOSTEMwrappercpp/src/ground/Richard.cpp calibration/DOSTEMwrappercpp/src/ground/Soil_Env.cpp calibration/DOSTEMwrappercpp/src/ground/Stefan.cpp calibration/DOSTEMwrappercpp/src/inc/cohortconst.h calibration/DOSTEMwrappercpp/src/inc/cohortkey.h calibration/DOSTEMwrappercpp/src/lookup/CohortLookup.cpp calibration/DOSTEMwrappercpp/src/run/Cohort.cpp calibration/DOSTEMwrappercpp/src/vegetation/Vegetation_Bgc.cpp
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This pull request has a few major parts:
Updated the code with Fengming's "DOSTEMv1.2" from the aeshna cluster
Changes the build steps for the calibration version so that the C++ shared library is built using the source code for the extrapolation version. This means there is no longer any need to copy files around in order to keep the calibration version in sync with the extrapolation version.
Includes the test data and configurations that Helene has provided.
The history is messy due to some experimenting with rebasing that resulted in a bunch of duplicated commits.