Merge pull request #95 from Ntkrell/master

fixed readme and cleaned directory structure
ecohydro · Aug 15, 2021 · a360af9 · a360af9
2 parents 4817bda + b91a7fb
commit a360af9
Show file tree

Hide file tree

Showing 10,043 changed files with 1,851,729 additions and 43 deletions.
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 # maize-Toff
-Repo for modeling analysis of maize yield variability and tradeoffs between yield and crop failure.
+Repository for ecohydrological modeling analysis of maize yield variability and tradeoffs between yield and crop failure. See article by Krell et al. (2021) "Consequences of dryland maize planting decisions under increased seasonal rainfall variability" in Water Resources Research (coming soon!). 
 
 ## Set-up
 Create fork of maize-Toff and git clone to local machine.
@@ -17,10 +17,13 @@ Note: To update dependecies in an existing environment, use `conda env update --
 * where models are stored
 
 ### data/
-* contains CETRAD rainfall data, maize variety info, survey info...
+* contains CETRAD rainfall data, maize variety info
 
 ### output/
-* exported figures, results, etc.
+* exported figures, results
+
+### notebooks/
+* contains notebook that generates figures from the manuscript
 
 ## How to use this model
 
@@ -131,6 +134,7 @@ The `model.output()` function returns all the simulation output structured as a
 * `LAI` Time series of crop LAI
 * `R` Time series of daily rainfall [mm]
 * `s` Time series of daily relative soil moisture [0-1]
+* `I` Time series of daily interception [mm]
 * `E` Time series of daily soil evaporation [mm]
 * `T` Time series of daily plant transpiration [mm]
 * `L` Time series of soil leakage loss [mm]
@@ -158,7 +162,7 @@ From the root of the directory, run the following in the command line to put `fa
 
 ` pip install -e .`
 
-After that, run tests from the subdirectory `tests`:
+After that, run tests from the subdirectory `farm/tests`, for example:
 
 `nosetests -vv test_sand`
 

diff --git a/data/Output/0.csv b/data/Output/0.csv
diff --git a/data/Output/1.csv b/data/Output/1.csv
diff --git a/data/Output/10.csv b/data/Output/10.csv
diff --git a/data/Output/100.csv b/data/Output/100.csv
diff --git a/data/Output/1000.csv b/data/Output/1000.csv
diff --git a/data/Output/1001.csv b/data/Output/1001.csv
diff --git a/data/Output/1002.csv b/data/Output/1002.csv
diff --git a/data/Output/1003.csv b/data/Output/1003.csv
diff --git a/data/Output/1004.csv b/data/Output/1004.csv
diff --git a/data/Output/1005.csv b/data/Output/1005.csv
diff --git a/data/Output/1006.csv b/data/Output/1006.csv
diff --git a/data/Output/1007.csv b/data/Output/1007.csv
diff --git a/data/Output/1008.csv b/data/Output/1008.csv
diff --git a/data/Output/1009.csv b/data/Output/1009.csv
diff --git a/data/Output/101.csv b/data/Output/101.csv
diff --git a/data/Output/1010.csv b/data/Output/1010.csv
diff --git a/data/Output/1011.csv b/data/Output/1011.csv
diff --git a/data/Output/1012.csv b/data/Output/1012.csv
diff --git a/data/Output/1013.csv b/data/Output/1013.csv
diff --git a/data/Output/1014.csv b/data/Output/1014.csv
diff --git a/data/Output/1015.csv b/data/Output/1015.csv
diff --git a/data/Output/1016.csv b/data/Output/1016.csv
diff --git a/data/Output/1017.csv b/data/Output/1017.csv
diff --git a/data/Output/1018.csv b/data/Output/1018.csv
diff --git a/data/Output/1019.csv b/data/Output/1019.csv
diff --git a/data/Output/102.csv b/data/Output/102.csv
diff --git a/data/Output/1020.csv b/data/Output/1020.csv
diff --git a/data/Output/1021.csv b/data/Output/1021.csv
diff --git a/data/Output/1022.csv b/data/Output/1022.csv
diff --git a/data/Output/1023.csv b/data/Output/1023.csv
diff --git a/data/Output/1024.csv b/data/Output/1024.csv
diff --git a/data/Output/1025.csv b/data/Output/1025.csv
diff --git a/data/Output/1026.csv b/data/Output/1026.csv
diff --git a/data/Output/1027.csv b/data/Output/1027.csv
diff --git a/data/Output/1028.csv b/data/Output/1028.csv
diff --git a/data/Output/1029.csv b/data/Output/1029.csv
diff --git a/data/Output/103.csv b/data/Output/103.csv
diff --git a/data/Output/1030.csv b/data/Output/1030.csv
diff --git a/data/Output/1031.csv b/data/Output/1031.csv
diff --git a/data/Output/1032.csv b/data/Output/1032.csv
diff --git a/data/Output/1033.csv b/data/Output/1033.csv
diff --git a/data/Output/1034.csv b/data/Output/1034.csv
diff --git a/data/Output/1035.csv b/data/Output/1035.csv
diff --git a/data/Output/1036.csv b/data/Output/1036.csv
diff --git a/data/Output/1037.csv b/data/Output/1037.csv
diff --git a/data/Output/1038.csv b/data/Output/1038.csv
diff --git a/data/Output/1039.csv b/data/Output/1039.csv
diff --git a/data/Output/104.csv b/data/Output/104.csv
diff --git a/data/Output/1040.csv b/data/Output/1040.csv
diff --git a/data/Output/1041.csv b/data/Output/1041.csv
diff --git a/data/Output/1042.csv b/data/Output/1042.csv
diff --git a/data/Output/1043.csv b/data/Output/1043.csv
diff --git a/data/Output/1044.csv b/data/Output/1044.csv
diff --git a/data/Output/1045.csv b/data/Output/1045.csv
diff --git a/data/Output/1046.csv b/data/Output/1046.csv
diff --git a/data/Output/1047.csv b/data/Output/1047.csv
diff --git a/data/Output/1048.csv b/data/Output/1048.csv
diff --git a/data/Output/1049.csv b/data/Output/1049.csv
diff --git a/data/Output/105.csv b/data/Output/105.csv
diff --git a/data/Output/1050.csv b/data/Output/1050.csv
diff --git a/data/Output/1051.csv b/data/Output/1051.csv
diff --git a/data/Output/1052.csv b/data/Output/1052.csv
diff --git a/data/Output/1053.csv b/data/Output/1053.csv
diff --git a/data/Output/1054.csv b/data/Output/1054.csv
diff --git a/data/Output/1055.csv b/data/Output/1055.csv
diff --git a/data/Output/1056.csv b/data/Output/1056.csv
diff --git a/data/Output/1057.csv b/data/Output/1057.csv
diff --git a/data/Output/1058.csv b/data/Output/1058.csv
diff --git a/data/Output/1059.csv b/data/Output/1059.csv
diff --git a/data/Output/106.csv b/data/Output/106.csv
diff --git a/data/Output/1060.csv b/data/Output/1060.csv
diff --git a/data/Output/1061.csv b/data/Output/1061.csv
diff --git a/data/Output/1062.csv b/data/Output/1062.csv
diff --git a/data/Output/1063.csv b/data/Output/1063.csv
diff --git a/data/Output/1064.csv b/data/Output/1064.csv
diff --git a/data/Output/1065.csv b/data/Output/1065.csv
diff --git a/data/Output/1066.csv b/data/Output/1066.csv
diff --git a/data/Output/1067.csv b/data/Output/1067.csv
diff --git a/data/Output/1068.csv b/data/Output/1068.csv
diff --git a/data/Output/1069.csv b/data/Output/1069.csv
diff --git a/data/Output/107.csv b/data/Output/107.csv
diff --git a/data/Output/1070.csv b/data/Output/1070.csv
diff --git a/data/Output/1071.csv b/data/Output/1071.csv
diff --git a/data/Output/1072.csv b/data/Output/1072.csv
diff --git a/data/Output/1073.csv b/data/Output/1073.csv
diff --git a/data/Output/1074.csv b/data/Output/1074.csv
diff --git a/data/Output/1075.csv b/data/Output/1075.csv
diff --git a/data/Output/1076.csv b/data/Output/1076.csv
diff --git a/data/Output/1077.csv b/data/Output/1077.csv
diff --git a/data/Output/1078.csv b/data/Output/1078.csv
diff --git a/data/Output/1079.csv b/data/Output/1079.csv
diff --git a/data/Output/108.csv b/data/Output/108.csv
diff --git a/data/Output/1080.csv b/data/Output/1080.csv
diff --git a/data/Output/1081.csv b/data/Output/1081.csv
diff --git a/data/Output/1082.csv b/data/Output/1082.csv
diff --git a/data/Output/1083.csv b/data/Output/1083.csv
diff --git a/data/Output/1084.csv b/data/Output/1084.csv
diff --git a/data/Output/1085.csv b/data/Output/1085.csv
diff --git a/data/Output/1086.csv b/data/Output/1086.csv
diff --git a/data/Output/1087.csv b/data/Output/1087.csv
diff --git a/data/Output/1088.csv b/data/Output/1088.csv
diff --git a/data/Output/1089.csv b/data/Output/1089.csv
diff --git a/data/Output/109.csv b/data/Output/109.csv
diff --git a/data/Output/1090.csv b/data/Output/1090.csv
diff --git a/data/Output/1091.csv b/data/Output/1091.csv
diff --git a/data/Output/1092.csv b/data/Output/1092.csv
diff --git a/data/Output/1093.csv b/data/Output/1093.csv
diff --git a/data/Output/1094.csv b/data/Output/1094.csv
diff --git a/data/Output/1095.csv b/data/Output/1095.csv
diff --git a/data/Output/1096.csv b/data/Output/1096.csv
diff --git a/data/Output/1097.csv b/data/Output/1097.csv
diff --git a/data/Output/1098.csv b/data/Output/1098.csv
diff --git a/data/Output/1099.csv b/data/Output/1099.csv
diff --git a/data/Output/11.csv b/data/Output/11.csv
diff --git a/data/Output/110.csv b/data/Output/110.csv
diff --git a/data/Output/1100.csv b/data/Output/1100.csv
diff --git a/data/Output/1101.csv b/data/Output/1101.csv
diff --git a/data/Output/1102.csv b/data/Output/1102.csv
diff --git a/data/Output/1103.csv b/data/Output/1103.csv
diff --git a/data/Output/1104.csv b/data/Output/1104.csv
diff --git a/data/Output/1105.csv b/data/Output/1105.csv
diff --git a/data/Output/1106.csv b/data/Output/1106.csv
diff --git a/data/Output/1107.csv b/data/Output/1107.csv
diff --git a/data/Output/1108.csv b/data/Output/1108.csv
diff --git a/data/Output/1109.csv b/data/Output/1109.csv
diff --git a/data/Output/111.csv b/data/Output/111.csv
diff --git a/data/Output/1110.csv b/data/Output/1110.csv
diff --git a/data/Output/1111.csv b/data/Output/1111.csv
diff --git a/data/Output/1112.csv b/data/Output/1112.csv
diff --git a/data/Output/1113.csv b/data/Output/1113.csv
diff --git a/data/Output/1114.csv b/data/Output/1114.csv
diff --git a/data/Output/1115.csv b/data/Output/1115.csv
diff --git a/data/Output/1116.csv b/data/Output/1116.csv
diff --git a/data/Output/1117.csv b/data/Output/1117.csv
diff --git a/data/Output/1118.csv b/data/Output/1118.csv
diff --git a/data/Output/1119.csv b/data/Output/1119.csv
diff --git a/data/Output/112.csv b/data/Output/112.csv
diff --git a/data/Output/1120.csv b/data/Output/1120.csv
diff --git a/data/Output/1121.csv b/data/Output/1121.csv
diff --git a/data/Output/1122.csv b/data/Output/1122.csv
diff --git a/data/Output/1123.csv b/data/Output/1123.csv
diff --git a/data/Output/1124.csv b/data/Output/1124.csv
diff --git a/data/Output/1125.csv b/data/Output/1125.csv
diff --git a/data/Output/1126.csv b/data/Output/1126.csv
diff --git a/data/Output/1127.csv b/data/Output/1127.csv
diff --git a/data/Output/1128.csv b/data/Output/1128.csv
diff --git a/data/Output/1129.csv b/data/Output/1129.csv
diff --git a/data/Output/113.csv b/data/Output/113.csv
diff --git a/data/Output/1130.csv b/data/Output/1130.csv
diff --git a/data/Output/1131.csv b/data/Output/1131.csv
diff --git a/data/Output/1132.csv b/data/Output/1132.csv
diff --git a/data/Output/1133.csv b/data/Output/1133.csv
diff --git a/data/Output/1134.csv b/data/Output/1134.csv
diff --git a/data/Output/1135.csv b/data/Output/1135.csv
diff --git a/data/Output/1136.csv b/data/Output/1136.csv
diff --git a/data/Output/1137.csv b/data/Output/1137.csv
diff --git a/data/Output/1138.csv b/data/Output/1138.csv
diff --git a/data/Output/1139.csv b/data/Output/1139.csv
diff --git a/data/Output/114.csv b/data/Output/114.csv
diff --git a/data/Output/1140.csv b/data/Output/1140.csv
diff --git a/data/Output/1141.csv b/data/Output/1141.csv
diff --git a/data/Output/1142.csv b/data/Output/1142.csv
diff --git a/data/Output/1143.csv b/data/Output/1143.csv
diff --git a/data/Output/1144.csv b/data/Output/1144.csv
diff --git a/data/Output/1145.csv b/data/Output/1145.csv
diff --git a/data/Output/1146.csv b/data/Output/1146.csv
diff --git a/data/Output/1147.csv b/data/Output/1147.csv
diff --git a/data/Output/1148.csv b/data/Output/1148.csv
diff --git a/data/Output/1149.csv b/data/Output/1149.csv
diff --git a/data/Output/115.csv b/data/Output/115.csv
diff --git a/data/Output/1150.csv b/data/Output/1150.csv
diff --git a/data/Output/1151.csv b/data/Output/1151.csv
diff --git a/data/Output/1152.csv b/data/Output/1152.csv
diff --git a/data/Output/1153.csv b/data/Output/1153.csv
diff --git a/data/Output/1154.csv b/data/Output/1154.csv
diff --git a/data/Output/1155.csv b/data/Output/1155.csv
diff --git a/data/Output/1156.csv b/data/Output/1156.csv
diff --git a/data/Output/1157.csv b/data/Output/1157.csv
diff --git a/data/Output/1158.csv b/data/Output/1158.csv
diff --git a/data/Output/1159.csv b/data/Output/1159.csv
diff --git a/data/Output/116.csv b/data/Output/116.csv
diff --git a/data/Output/1160.csv b/data/Output/1160.csv
diff --git a/data/Output/1161.csv b/data/Output/1161.csv
diff --git a/data/Output/1162.csv b/data/Output/1162.csv
diff --git a/data/Output/1163.csv b/data/Output/1163.csv
diff --git a/data/Output/1164.csv b/data/Output/1164.csv
diff --git a/data/Output/1165.csv b/data/Output/1165.csv
diff --git a/data/Output/1166.csv b/data/Output/1166.csv
diff --git a/data/Output/1167.csv b/data/Output/1167.csv
diff --git a/data/Output/1168.csv b/data/Output/1168.csv
diff --git a/data/Output/1169.csv b/data/Output/1169.csv
diff --git a/data/Output/117.csv b/data/Output/117.csv
diff --git a/data/Output/1170.csv b/data/Output/1170.csv
diff --git a/data/Output/1171.csv b/data/Output/1171.csv
diff --git a/data/Output/1172.csv b/data/Output/1172.csv
diff --git a/data/Output/1173.csv b/data/Output/1173.csv
diff --git a/data/Output/1174.csv b/data/Output/1174.csv
diff --git a/data/Output/1175.csv b/data/Output/1175.csv
diff --git a/data/Output/1176.csv b/data/Output/1176.csv
diff --git a/data/Output/1177.csv b/data/Output/1177.csv
diff --git a/data/Output/1178.csv b/data/Output/1178.csv
diff --git a/data/Output/1179.csv b/data/Output/1179.csv
diff --git a/data/Output/118.csv b/data/Output/118.csv
diff --git a/data/Output/1180.csv b/data/Output/1180.csv
diff --git a/data/Output/1181.csv b/data/Output/1181.csv
diff --git a/data/Output/1182.csv b/data/Output/1182.csv
diff --git a/data/Output/1183.csv b/data/Output/1183.csv
diff --git a/data/Output/1184.csv b/data/Output/1184.csv
diff --git a/data/Output/1185.csv b/data/Output/1185.csv
diff --git a/data/Output/1186.csv b/data/Output/1186.csv
diff --git a/data/Output/1187.csv b/data/Output/1187.csv
diff --git a/data/Output/1188.csv b/data/Output/1188.csv
diff --git a/data/Output/1189.csv b/data/Output/1189.csv
diff --git a/data/Output/119.csv b/data/Output/119.csv
diff --git a/data/Output/1190.csv b/data/Output/1190.csv
diff --git a/data/Output/1191.csv b/data/Output/1191.csv
diff --git a/data/Output/1192.csv b/data/Output/1192.csv
diff --git a/data/Output/1193.csv b/data/Output/1193.csv
diff --git a/data/Output/1194.csv b/data/Output/1194.csv
diff --git a/data/Output/1195.csv b/data/Output/1195.csv
diff --git a/data/Output/1196.csv b/data/Output/1196.csv
diff --git a/data/Output/1197.csv b/data/Output/1197.csv
diff --git a/data/Output/1198.csv b/data/Output/1198.csv
diff --git a/data/Output/1199.csv b/data/Output/1199.csv
diff --git a/data/Output/12.csv b/data/Output/12.csv
diff --git a/data/Output/120.csv b/data/Output/120.csv
diff --git a/data/Output/1200.csv b/data/Output/1200.csv
diff --git a/data/Output/1201.csv b/data/Output/1201.csv
diff --git a/data/Output/1202.csv b/data/Output/1202.csv
diff --git a/data/Output/1203.csv b/data/Output/1203.csv
diff --git a/data/Output/1204.csv b/data/Output/1204.csv
diff --git a/data/Output/1205.csv b/data/Output/1205.csv
diff --git a/data/Output/1206.csv b/data/Output/1206.csv
diff --git a/data/Output/1207.csv b/data/Output/1207.csv
diff --git a/data/Output/1208.csv b/data/Output/1208.csv
diff --git a/data/Output/1209.csv b/data/Output/1209.csv
diff --git a/data/Output/121.csv b/data/Output/121.csv
diff --git a/data/Output/1210.csv b/data/Output/1210.csv
diff --git a/data/Output/1211.csv b/data/Output/1211.csv
diff --git a/data/Output/1212.csv b/data/Output/1212.csv
diff --git a/data/Output/1213.csv b/data/Output/1213.csv
diff --git a/data/Output/1214.csv b/data/Output/1214.csv
diff --git a/data/Output/1215.csv b/data/Output/1215.csv
diff --git a/data/Output/1216.csv b/data/Output/1216.csv
diff --git a/data/Output/1217.csv b/data/Output/1217.csv
diff --git a/data/Output/1218.csv b/data/Output/1218.csv
diff --git a/data/Output/1219.csv b/data/Output/1219.csv
diff --git a/data/Output/122.csv b/data/Output/122.csv
diff --git a/data/Output/1220.csv b/data/Output/1220.csv
diff --git a/data/Output/1221.csv b/data/Output/1221.csv
diff --git a/data/Output/1222.csv b/data/Output/1222.csv
diff --git a/data/Output/1223.csv b/data/Output/1223.csv
diff --git a/data/Output/1224.csv b/data/Output/1224.csv
diff --git a/data/Output/1225.csv b/data/Output/1225.csv
diff --git a/data/Output/1226.csv b/data/Output/1226.csv
diff --git a/data/Output/1227.csv b/data/Output/1227.csv
diff --git a/data/Output/1228.csv b/data/Output/1228.csv
diff --git a/data/Output/1229.csv b/data/Output/1229.csv
diff --git a/data/Output/123.csv b/data/Output/123.csv
diff --git a/data/Output/1230.csv b/data/Output/1230.csv
diff --git a/data/Output/1231.csv b/data/Output/1231.csv
diff --git a/data/Output/1232.csv b/data/Output/1232.csv
diff --git a/data/Output/1233.csv b/data/Output/1233.csv
diff --git a/data/Output/1234.csv b/data/Output/1234.csv
diff --git a/data/Output/1235.csv b/data/Output/1235.csv
diff --git a/data/Output/1236.csv b/data/Output/1236.csv
diff --git a/data/Output/1237.csv b/data/Output/1237.csv
diff --git a/data/Output/1238.csv b/data/Output/1238.csv
diff --git a/data/Output/1239.csv b/data/Output/1239.csv
diff --git a/data/Output/124.csv b/data/Output/124.csv
diff --git a/data/Output/1240.csv b/data/Output/1240.csv
diff --git a/data/Output/1241.csv b/data/Output/1241.csv
diff --git a/data/Output/1242.csv b/data/Output/1242.csv
diff --git a/data/Output/1243.csv b/data/Output/1243.csv
diff --git a/data/Output/1244.csv b/data/Output/1244.csv
diff --git a/data/Output/1245.csv b/data/Output/1245.csv
diff --git a/data/Output/1246.csv b/data/Output/1246.csv
diff --git a/data/Output/1247.csv b/data/Output/1247.csv
diff --git a/data/Output/1248.csv b/data/Output/1248.csv
diff --git a/data/Output/1249.csv b/data/Output/1249.csv
diff --git a/data/Output/125.csv b/data/Output/125.csv
diff --git a/data/Output/1250.csv b/data/Output/1250.csv
diff --git a/data/Output/1251.csv b/data/Output/1251.csv
diff --git a/data/Output/1252.csv b/data/Output/1252.csv
diff --git a/data/Output/1253.csv b/data/Output/1253.csv
diff --git a/data/Output/1254.csv b/data/Output/1254.csv
diff --git a/data/Output/1255.csv b/data/Output/1255.csv
diff --git a/data/Output/1256.csv b/data/Output/1256.csv
diff --git a/data/Output/1257.csv b/data/Output/1257.csv
diff --git a/data/Output/1258.csv b/data/Output/1258.csv
diff --git a/data/Output/1259.csv b/data/Output/1259.csv
diff --git a/data/Output/126.csv b/data/Output/126.csv
diff --git a/data/Output/1260.csv b/data/Output/1260.csv
diff --git a/data/Output/1261.csv b/data/Output/1261.csv
diff --git a/data/Output/1262.csv b/data/Output/1262.csv
diff --git a/data/Output/1263.csv b/data/Output/1263.csv
diff --git a/data/Output/1264.csv b/data/Output/1264.csv
diff --git a/data/Output/1265.csv b/data/Output/1265.csv
diff --git a/data/Output/1266.csv b/data/Output/1266.csv