Created
March 7, 2013 02:42
-
-
Save dlebauer/5105169 to your computer and use it in GitHub Desktop.
diffs of ED2IN files: diff -wu <(grep -v [[:space:]]*! web/template/ED2.2_r82) <(grep -v [[:space:]]*! models/ed/inst/ED2IN.r82); diff -w <(grep -v [[:space:]]*! web/template/ED2.2_r46) <(grep -v [[:space:]]*! models/ed/inst/ED2IN.r46)
This file contains hidden or 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
--- /dev/fd/63 2013-03-06 20:42:02.260732155 -0600 | |
+++ /dev/fd/62 2013-03-06 20:42:02.260732155 -0600 | |
@@ -3,68 +3,122 @@ | |
+ NL%IMONTHZ = @END_MONTH@ | |
+ NL%IDATEZ = @END_DAY@ | |
+ NL%IYEARZ = @END_YEAR@ | |
+ | |
+ | |
+ | |
+ | |
+ | |
+ | |
+ | |
+ | |
+ | |
+ | |
+ | |
+ | |
+ | |
+ | |
+ | |
+ NL%SOI_LAT = @SITE_LAT@ | |
+ NL%SOI_LON = @SITE_LON@ | |
+ | |
+ | |
+ | |
+ | |
+ | |
+ | |
- NL%LOADMETH = 0 | |
- NL%ATTACH_METADATA = 1 | |
NL%IED_INIT_MODE = 0 | |
+ | |
NL%SFILIN = '@SITE_PSSCSS@' | |
- NL%ITIMEH = 0000 | |
- NL%IDATEH = 01 | |
- NL%IMONTHH = 01 | |
- NL%IYEARH = 2000 | |
- NL%NZG = 9 | |
- NL%NZS = 4 | |
- | |
- NL%NSLCON = 2 | |
- NL%SLXCLAY = 0.23 | |
- NL%SLXSAND = 0.26 | |
+ | |
+ | |
+ | |
+ | |
+ | |
+ | |
+ | |
+ | |
+ | |
NL%SLZ = -2.17, -1.50, -1.10, -0.80, -0.60, -0.45, -0.30, -0.20, -0.12, -0.06 | |
NL%SLMSTR = 0.60, 0.60, 0.60, 0.60, 0.60, 0.60, 0.60, 0.60, 0.60 | |
NL%STGOFF = 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0 | |
+ | |
+ | |
+ | |
NL%VEG_DATABASE = '@ED_VEG@' | |
NL%SOIL_DATABASE = '@ED_SOIL@' | |
- NL%ED_INPUTS_DIR = '@ED_INPUTS@' | |
+ NL%ED_INPUTS_DIR = '/home/share/dietze_lab/ed_db/ed_inputs/' | |
+ | |
+ | |
NL%ED_MET_DRIVER_DB = '@SITE_MET@' | |
+ | |
NL%SOILSTATE_DB = '' | |
NL%SOILDEPTH_DB = '' | |
- NL%INTEGRATION_SCHEME = 1 | |
- NL%RK4_TOLERANCE = 0.01 | |
- NL%IBRANCH_THERMO = 0 | |
- NL%ISTOMA_SCHEME = 0 | |
- NL%IPHEN_SCHEME = 0 | |
- NL%REPRO_SCHEME = 1 | |
- NL%DECOMP_SCHEME = 0 | |
- NL%LAPSE_SCHEME = 0 | |
- NL%CROWN_MOD = 0 | |
- NL%N_PLANT_LIM = 0 | |
- NL%N_DECOMP_LIM = 0 | |
- NL%INCLUDE_FIRE = 0 | |
- NL%IANTH_DISTURB = 0 | |
- NL%ICANTURB = 0 | |
- NL%ISFCLYRM = 3 | |
- NL%PFT_1ST_CHECK = 0 | |
- NL%MAXPATCH = 1 | |
- NL%MAXCOHORT = 1 | |
- NL%ZROUGH = 0.1 | |
- NL%TREEFALL_DISTURBANCE_RATE = 0.0 | |
- NL%RUNOFF_TIME = 28800.0 | |
- NL%IPRINTPOLYS = 0 | |
+ | |
+ | |
+ | |
+ | |
+ | |
+ | |
+ | |
+ | |
+ | |
+ | |
+ | |
+ | |
+ | |
+ | |
+ | |
+ | |
+ | |
+ | |
+ | |
+ | |
+ | |
+ | |
+ | |
+ | |
+ | |
+ | |
+ | |
+ | |
+ | |
+ | |
+ | |
+ | |
+ | |
+ | |
+ | |
+ | |
NL%PRINTVARS = 'AVG_PCPG','AVG_CAN_TEMP','AVG_VAPOR_AC','AVG_CAN_SHV' | |
+ | |
+ | |
NL%PFMTSTR = 'f10.8','f5.1','f7.2','f9.5' | |
- NL%IPMIN = 1 | |
- NL%IPMAX = 60 | |
- NL%ISHUFFLE = 0 | |
- | |
- NL%IPHENYS1 = 1992 | |
- NL%IPHENYSF = 2003 | |
- NL%IPHENYF1 = 1992 | |
- NL%IPHENYFF = 2003 | |
- NL%PHENPATH = '' | |
+ | |
+ | |
+ | |
+ | |
+ | |
+ | |
+ | |
+ NL%IPHENYS1 = @PHENOL_START@ | |
+ NL%IPHENYSF = @PHENOL_END@ | |
+ NL%IPHENYF1 = @PHENOL_START@ | |
+ NL%IPHENYFF = @PHENOL_END@ | |
+ NL%PHENPATH = '@PHENOL@' | |
+ | |
+ | |
+ | |
NL%IEDCNFGF = '@CONFIGFILE@' | |
- NL%EVENT_FILE = '' | |
+ | |
+ | |
+ | |
This file contains hidden or 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
--- /dev/fd/63 2013-03-06 20:41:54.004773867 -0600 | |
+++ /dev/fd/62 2013-03-06 20:41:54.004773867 -0600 | |
@@ -1,135 +1,374 @@ | |
$ED_NL | |
+ NL%EXPNME = '@ENSNAME@' | |
+ NL%RUNTYPE = 'INITIAL' | |
+ | |
+ | |
+ | |
+ NL%IMONTHA = @START_MONTH@ | |
+ NL%IDATEA = @START_DAY@ | |
+ NL%IYEARA = @START_YEAR@ | |
+ NL%ITIMEA = 0000 | |
+ | |
+ | |
+ | |
+ NL%IMONTHZ = @END_MONTH@ | |
+ NL%IDATEZ = @END_DAY@ | |
+ NL%IYEARZ = @END_YEAR@ | |
+ NL%ITIMEZ = 0000 | |
+ | |
+ | |
+ | |
+ NL%DTLSM = 600. | |
+ NL%RADFRQ = 600. | |
+ | |
+ | |
+ | |
+ | |
+ NL%N_ED_REGION = 0 | |
+ NL%GRID_TYPE = 0 | |
+ | |
+ | |
+ | |
+ | |
+ NL%NNXP = 110 | |
+ NL%NNYP = 70 | |
+ NL%DELTAX = 60000. | |
+ NL%DELTAY = 60000. | |
+ NL%POLELAT = -2.609075 | |
+ NL%POLELON = -60.2093 | |
+ NL%CENTLAT = -2.609075 | |
+ NL%CENTLON = -60.2093 | |
+ | |
+ | |
+ | |
+ NL%NSTRATX = 1,4 | |
+ NL%NSTRATY = 1,4 | |
NL%POI_RES = 1.00 | |
+ | |
+ | |
+ | |
NL%LOADMETH = 0 | |
- NL%ATTACH_METADATA = 1 | |
- NL%IED_INIT_MODE = 0 | |
+ | |
+ | |
+ | |
+ | |
+ | |
+ | |
+ | |
+ | |
+ NL%ATTACH_METADATA = 0 | |
+ | |
+ | |
+ | |
+ NL%UNITFAST = 0 | |
+ NL%UNITSTATE = 3 | |
+ | |
+ | |
+ | |
+ | |
+ | |
+ | |
+ | |
+ | |
+ | |
+ | |
+ | |
+ | |
+ NL%IED_INIT_MODE = 3 | |
+ | |
+ | |
+ | |
+ NL%EDRES = 1.0 | |
+ | |
+ | |
NL%SFILIN = '@SITE_PSSCSS@' | |
+ | |
+ | |
+ | |
+ | |
NL%ITIMEH = 0000 | |
NL%IDATEH = 01 | |
NL%IMONTHH = 01 | |
- NL%IYEARH = 2000 | |
+ NL%IYEARH = 1500 | |
+ | |
+ | |
+ | |
NL%NZG = 9 | |
- NL%NZS = 4 | |
- NL%NSLCON = 2 | |
- NL%ISOILCOL = 21 | |
- NL%SLXCLAY = 0.23 | |
- NL%SLXSAND = 0.26 | |
- NL%SLZ = -2.17, -1.50, -1.10, -0.80, -0.60, -0.45, -0.30, -0.20, -0.12, -0.06 | |
- NL%SLMSTR = 0.60, 0.60, 0.60, 0.60, 0.60, 0.60, 0.60, 0.60, 0.60 | |
+ NL%NZS = 1 | |
+ | |
+ | |
+ | |
+ NL%ISOILFLG = 2 | |
+ | |
+ | |
+ | |
+ | |
+ | |
+ | |
+ | |
+ | |
+ | |
+ | |
+ | |
+ | |
+ | |
+ NL%SLZ = -2.0,-1.5, -1.0, -0.80, -0.60, -0.40, -0.2, -0.10, -0.05 | |
+ NL%SLMSTR = 0.65, 0.65, 0.65, 0.65, 0.65, 0.65, 0.65, 0.65, 0.65 | |
NL%STGOFF = 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0 | |
+ | |
+ | |
+ | |
+ | |
NL%VEG_DATABASE = '@ED_VEG@' | |
NL%SOIL_DATABASE = '@ED_SOIL@' | |
- NL%LU_DATABASE = '' | |
+ NL%LU_DATABASE = '/home/mdietze/data/ed_inputs/glu/' | |
NL%PLANTATION_FILE = '' | |
NL%THSUMS_DATABASE = '@ED_INPUTS@' | |
NL%ED_MET_DRIVER_DB = '@SITE_MET@' | |
NL%SOILSTATE_DB = '' | |
NL%SOILDEPTH_DB = '' | |
+ | |
+ | |
+ | |
+ | |
+ NL%ISOILSTATEINIT = 0 | |
+ NL%ISOILDEPTHFLG = 0 | |
+ | |
+ | |
+ | |
+ | |
+ NL%ISOILBC = 1 | |
+ | |
+ | |
+ | |
+ | |
NL%IVEGT_DYNAMICS = 1 | |
+ | |
+ | |
NL%IBIGLEAF = 0 | |
+ | |
+ | |
+ | |
NL%INTEGRATION_SCHEME = 1 | |
+ | |
+ | |
+ | |
+ | |
NL%RK4_TOLERANCE = 0.01 | |
+ | |
+ | |
+ | |
+ | |
NL%IBRANCH_THERMO = 0 | |
- NL%IPHYSIOL = 0 | |
- NL%IALLOM = 0 | |
+ | |
+ NL%IPHYSIOL = 2 | |
+ | |
+ | |
+ | |
+ NL%IALLOM = 2 | |
+ | |
+ | |
+ | |
+ | |
NL%IGRASS = 0 | |
- NL%IPHEN_SCHEME = 0 | |
- NL%RADINT = 0 | |
- NL%RADSLP = 0 | |
- NL%REPRO_SCHEME = 1 | |
+ | |
+ | |
+ NL%IPHEN_SCHEME = @PHENOL_SCHEME@ | |
+ | |
+ | |
+ NL%RADINT = -11.3868 | |
+ NL%RADSLP = 0.0824 | |
+ | |
+ | |
+ | |
+ NL%REPRO_SCHEME = 0 | |
+ | |
+ | |
+ | |
NL%LAPSE_SCHEME = 0 | |
- NL%CROWN_MOD = 0 | |
+ | |
+ | |
+ | |
+ NL%CROWN_MOD = 1 | |
+ | |
+ | |
+ | |
NL%ICANRAD = 0 | |
NL%LTRANS_VIS = 0.050 | |
NL%LTRANS_NIR = 0.270 | |
NL%LREFLECT_VIS = 0.150 | |
NL%LREFLECT_NIR = 0.540 | |
- NL%ORIENT_TREE = 0.150 | |
- NL%ORIENT_GRASS = -0.150 | |
- NL%CLUMP_TREE = 1.000 | |
+ NL%ORIENT_TREE = 0.100 | |
+ NL%ORIENT_GRASS = -0.100 | |
+ NL%CLUMP_TREE = 0.800 | |
NL%CLUMP_GRASS = 1.000 | |
+ | |
+ | |
+ | |
+ | |
NL%DECOMP_SCHEME = 0 | |
- NL%H2O_PLANT_LIM = 2 | |
- NL%VMFACT_C3 = 1.25 | |
+ | |
+ | |
+ | |
+ NL%H2O_PLANT_LIM = 1 | |
+ | |
+ | |
+ NL%VMFACT_C3 = 1.00 | |
NL%VMFACT_C4 = 1.00 | |
NL%MPHOTO_TRC3 = 9.0 | |
NL%MPHOTO_TEC3 = 7.2 | |
- NL%MPHOTO_C4 = 5.0 | |
+ NL%MPHOTO_C4 = 5.2 | |
NL%BPHOTO_BLC3 = 10000. | |
NL%BPHOTO_NLC3 = 1000. | |
- NL%BPHOTO_C4 = 8000. | |
- NL%KW_GRASS = 300. | |
- NL%KW_TREE = 300. | |
+ NL%BPHOTO_C4 = 10000. | |
+ NL%KW_GRASS = 900. | |
+ NL%KW_TREE = 600. | |
NL%GAMMA_C3 = 0.015 | |
- NL%GAMMA_C4 = 0.036 | |
- NL%D0_GRASS = 0.015 | |
- NL%D0_TREE = 0.015 | |
+ NL%GAMMA_C4 = 0.040 | |
+ NL%D0_GRASS = 0.016 | |
+ NL%D0_TREE = 0.016 | |
NL%ALPHA_C3 = 0.080 | |
- NL%ALPHA_C4 = 0.053 | |
+ NL%ALPHA_C4 = 0.055 | |
NL%KLOWCO2IN = 4000. | |
NL%RRFFACT = 1.000 | |
- NL%GROWTHRESP = 0.33333333333 | |
+ NL%GROWTHRESP = 0.333 | |
NL%LWIDTH_GRASS = 0.05 | |
NL%LWIDTH_BLTREE = 0.10 | |
NL%LWIDTH_NLTREE = 0.05 | |
NL%Q10_C3 = 2.4 | |
NL%Q10_C4 = 2.4 | |
- NL%THETACRIT = -1.20 | |
+ | |
+ | |
+ | |
+ NL%THETACRIT = -1.15 | |
+ | |
+ | |
+ | |
NL%QUANTUM_EFFICIENCY_T = 0 | |
+ | |
+ | |
+ | |
NL%N_PLANT_LIM = 0 | |
+ | |
+ | |
+ | |
NL%N_DECOMP_LIM = 0 | |
- NL%INCLUDE_FIRE = 0 | |
- NL%SM_FIRE = 0.07 | |
+ | |
+ | |
+ | |
+ | |
+ NL%FIRE_PARAMETER = 0.2 | |
+ NL%SM_FIRE = -1.45 | |
+ | |
+ | |
+ | |
NL%IANTH_DISTURB = 0 | |
- NL%ICANTURB = 0 | |
- NL%ISFCLYRM = 3 | |
+ | |
+ | |
+ | |
+ NL%ICANTURB = 1 | |
+ | |
+ | |
+ | |
+ | |
+ | |
+ | |
NL%IED_GRNDVAP = 0 | |
+ | |
+ | |
+ | |
+ | |
NL%GAMM = 13.0 | |
NL%GAMH = 13.0 | |
NL%TPRANDTL = 0.74 | |
NL%RIBMAX = 0.50 | |
NL%LEAF_MAXWHC = 0.11 | |
- NL%IPERCOL = 0 | |
+ | |
+ | |
+ | |
+ | |
+ NL%IPERCOL = 1 | |
+ | |
+ | |
+ | |
+ | |
+ | |
+ | |
+ | |
NL%PFT_1ST_CHECK = 0 | |
- NL%MAXSITE = 1 | |
- NL%MAXPATCH = 1 | |
- NL%MAXCOHORT = 1 | |
+ | |
+ | |
+ | |
+ NL%MAXSITE = 6 | |
+ NL%MAXPATCH = 30 | |
+ NL%MAXCOHORT = 60 | |
NL%MIN_SITE_AREA = 0.005 | |
+ NL%MIN_PATCH_AREA = 0.005 | |
+ | |
+ | |
+ | |
+ | |
NL%ZROUGH = 0.1 | |
- NL%TREEFALL_DISTURBANCE_RATE = 0.0 | |
+ | |
+ | |
+ | |
+ | |
NL%TIME2CANOPY = 0.0 | |
- NL%RUNOFF_TIME = 28800.0 | |
+ | |
+ | |
+ | |
+ | |
+ NL%RUNOFF_TIME = 86400.0 | |
+ | |
+ | |
+ | |
+ | |
NL%UBMIN = 0.65 | |
NL%UGBMIN = 0.25 | |
NL%USTMIN = 0.05 | |
+ | |
+ | |
+ | |
NL%IPRINTPOLYS = 0 | |
NL%NPVARS = 1 | |
NL%PRINTVARS = 'AVG_PCPG','AVG_CAN_TEMP','AVG_VAPOR_AC','AVG_CAN_SHV' | |
NL%PFMTSTR = 'f10.8','f5.1','f7.2','f9.5' | |
NL%IPMIN = 1 | |
NL%IPMAX = 60 | |
- NL%ISHUFFLE = 0 | |
+ | |
+ | |
+ | |
NL%IMETAVG = 0 | |
NL%IMETRAD = 0 | |
- NL%IPHENYS1 = 1992 | |
- NL%IPHENYSF = 2003 | |
- NL%IPHENYF1 = 1992 | |
- NL%IPHENYFF = 2003 | |
- NL%PHENPATH = '' | |
+ | |
+ | |
+ | |
+ NL%IPHENYS1 = @PHENOL_START@ | |
+ NL%IPHENYSF = @PHENOL_END@ | |
+ NL%IPHENYF1 = @PHENOL_START@ | |
+ NL%IPHENYFF = @PHENOL_END@ | |
+ NL%PHENPATH = '@PHENOL@' | |
+ | |
+ | |
+ | |
NL%IEDCNFGF = '@CONFIGFILE@' | |
- NL%EVENT_FILE = '' | |
+ NL%EVENT_FILE = 'myevents.xml' | |
+ | |
+ | |
NL%IDETAILED = 0 | |
NL%PATCH_KEEP = 0 | |
+ | |
+ NL%IOPTINPT = '' | |
$END |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment