Merge pull request dailyerosion#200 from akrherz/231120

Omnibus
akrherz · Dec 7, 2023 · c27f6b2 · c27f6b2
2 parents 04d7745 + b5df381
commit c27f6b2
Show file tree

Hide file tree

Showing 42 changed files with 267 additions and 244 deletions.
diff --git a/environment.yml b/environment.yml
@@ -1,4 +1,6 @@
 dependencies:
+  # command line stuff
+  - click
   - coverage
   - pyshp
   - tqdm

diff --git a/scripts/cligen/add_new_year.py b/scripts/cligen/add_new_year.py
@@ -8,8 +8,9 @@
 import glob
 import os
 import subprocess
-import sys
+from datetime import date
 
+import click
 from pyiem.util import logger
 from tqdm import tqdm
 
@@ -24,17 +25,14 @@ def parse_filename(filename):
 
 def workflow(filename, newyear, analogyear):
     """Effort this file, please"""
-    # Figure out what this file's lon/lat values are
-    lon, lat = parse_filename(filename)
-    # LOG.debug("%s -> %.2f %.2f", filename, lon, lat)
     with open(filename, encoding="ascii") as fh:
         lines = fh.readlines()
     # Replace the header information denoting years simulated
     years_simulated = int((newyear - 2007) + 1)
-    lines[4] = (
-        f"    {lat:.2f}   {lon:.2f}         289          {years_simulated}"
-        f"        2007              {years_simulated}\n"
-    )
+    tokens = lines[4].strip().split()
+    tokens[3] = str(years_simulated)
+    tokens[5] = str(years_simulated)
+    lines[4] = f"{' '.join(tokens)}\n"
     data = "".join(lines)
     if data.find(f"1\t1\t{newyear}") > 0:
         LOG.info("%s already has %s data", filename, newyear)
@@ -65,10 +63,11 @@ def compute_analog_year(year):
     return analogyear
 
 
-def main(argv):
+@click.command()
+@click.option("--scenario", type=int, default=0)
+@click.option("--year", type=int, default=date.today().year + 1)
+def main(scenario, year):
     """Go Main Go"""
-    scenario = argv[1]
-    year = int(argv[2])
     analogyear = compute_analog_year(year)
     LOG.info("Using analog year %s for new year %s", analogyear, year)
     os.chdir(f"/i/{scenario}/cli")
@@ -80,4 +79,4 @@ def main(argv):
 
 
 if __name__ == "__main__":
-    main(sys.argv)
+    main()
diff --git a/scripts/import/blocks/B1.txt b/scripts/import/blocks/B1.txt
@@ -1,3 +1,3 @@
-%(pdate)s  %(yr)s  1 Tillage	OpCropDef.PLNTFC	{0.050000, 2}
-%(pdate)s  %(yr)s  1 Plant-Annual	%(plant)s	 {0.762000}
-10  10  %(yr)s  1 Harvest-Annual	%(plant)s	{}
+%(pdate)s  %(yr)s  1 Tillage    OpCropDef.PLNTFC    {0.050000, 2}
+%(pdate)s  %(yr)s  1 Plant-Annual    %(plant)s     {0.762000}
+10  10  %(yr)s  1 Harvest-Annual    %(plant)s    {}
diff --git a/scripts/import/blocks/B2.txt b/scripts/import/blocks/B2.txt
@@ -1,5 +1,5 @@
 %(pdatem10)s  %(yr)s  1 Tillage OpCropDef.FCSTACDP      {0.101600, 2}
-%(pdate)s  %(yr)s  1 Tillage	OpCropDef.PLDDO	{0.050800, 2}
-%(pdate)s  %(yr)s  1 Plant-Annual	%(plant)s	 {0.762000}
-10  10  %(yr)s  1 Harvest-Annual	%(plant)s	{}
-11  1  %(yr)s  1 Tillage	OpCropDef.CHISSTSP	{0.203200, 2}
+%(pdate)s  %(yr)s  1 Tillage    OpCropDef.PLDDO    {0.050800, 2}
+%(pdate)s  %(yr)s  1 Plant-Annual    %(plant)s     {0.762000}
+10  10  %(yr)s  1 Harvest-Annual    %(plant)s    {}
+11  1  %(yr)s  1 Tillage    OpCropDef.CHISSTSP    {0.203200, 2}
diff --git a/scripts/import/blocks/B3.txt b/scripts/import/blocks/B3.txt
@@ -1,5 +1,5 @@
-%(pdatem10)s  %(yr)s  1 Tillage	OpCropDef.FCSTACDP	{0.101600, 1}
-%(pdate)s  %(yr)s  1 Tillage	OpCropDef.PLDDO	{0.050800, 2}
-%(pdate)s  %(yr)s  1 Plant-Annual	%(plant)s	 {0.762000}
-10  10  %(yr)s  1 Harvest-Annual	%(plant)s	{}
-11  1  %(yr)s  1 Tillage	OpCropDef.CHISSTSP	{0.203200, 2}
+%(pdatem10)s  %(yr)s  1 Tillage    OpCropDef.FCSTACDP    {0.101600, 1}
+%(pdate)s  %(yr)s  1 Tillage    OpCropDef.PLDDO    {0.050800, 2}
+%(pdate)s  %(yr)s  1 Plant-Annual    %(plant)s     {0.762000}
+10  10  %(yr)s  1 Harvest-Annual    %(plant)s    {}
+11  1  %(yr)s  1 Tillage    OpCropDef.CHISSTSP    {0.203200, 2}
diff --git a/scripts/import/blocks/B4.txt b/scripts/import/blocks/B4.txt
@@ -1,6 +1,6 @@
 %(pdatem10)s  %(yr)s  1 Tillage  OpCropDef.TAND0002      {0.101600, 2}
 %(pdatem5)s  %(yr)s  1 Tillage OpCropDef.FCSTACDP      {0.101600, 2}
-%(pdate)s  %(yr)s  1 Tillage	OpCropDef.PLDDO	{0.050800, 2}
-%(pdate)s  %(yr)s  1 Plant-Annual	%(plant)s	 {0.762000}
-10  10  %(yr)s  1 Harvest-Annual	%(plant)s	{}
-11  1  %(yr)s  1 Tillage	OpCropDef.CHISSTSP	{0.203200, 2}
+%(pdate)s  %(yr)s  1 Tillage    OpCropDef.PLDDO    {0.050800, 2}
+%(pdate)s  %(yr)s  1 Plant-Annual    %(plant)s     {0.762000}
+10  10  %(yr)s  1 Harvest-Annual    %(plant)s    {}
+11  1  %(yr)s  1 Tillage    OpCropDef.CHISSTSP    {0.203200, 2}
diff --git a/scripts/import/blocks/B5.txt b/scripts/import/blocks/B5.txt
@@ -1,7 +1,7 @@
-%(pdatem15)s  %(yr)s  1 Tillage	OpCropDef.TAND0002	{0.101600, 2}
-%(pdatem10)s  %(yr)s  1 Tillage	OpCropDef.TAND0002	{0.101600, 2}
-%(pdatem5)s  %(yr)s  1 Tillage	OpCropDef.FCSTACDP	{0.101600, 1}
-%(pdate)s  %(yr)s  1 Tillage	OpCropDef.PLDDO	{0.050800, 2}
-%(pdate)s  %(yr)s  1 Plant-Annual	%(plant)s	 {0.762000}
-10  10  %(yr)s  1 Harvest-Annual	%(plant)s	{}
-11  1  %(yr)s  1 Tillage	OpCropDef.CHISSTSP	{0.203200, 2}
+%(pdatem15)s  %(yr)s  1 Tillage    OpCropDef.TAND0002    {0.101600, 2}
+%(pdatem10)s  %(yr)s  1 Tillage    OpCropDef.TAND0002    {0.101600, 2}
+%(pdatem5)s  %(yr)s  1 Tillage    OpCropDef.FCSTACDP    {0.101600, 1}
+%(pdate)s  %(yr)s  1 Tillage    OpCropDef.PLDDO    {0.050800, 2}
+%(pdate)s  %(yr)s  1 Plant-Annual    %(plant)s     {0.762000}
+10  10  %(yr)s  1 Harvest-Annual    %(plant)s    {}
+11  1  %(yr)s  1 Tillage    OpCropDef.CHISSTSP    {0.203200, 2}
diff --git a/scripts/import/blocks/B6.txt b/scripts/import/blocks/B6.txt
@@ -1,6 +1,6 @@
-%(pdatem10)s  %(yr)s  1 Tillage	OpCropDef.TAND0002	{0.101600, 2}
-%(pdatem5)s  %(yr)s  1 Tillage	OpCropDef.FCSTACDP	{0.101600, 1}
-%(pdate)s  %(yr)s  1 Tillage	OpCropDef.PLDDO	{0.050800, 2}
-%(pdate)s  %(yr)s  1 Plant-Annual	%(plant)s	 {0.762000}
-10  10  %(yr)s  1 Harvest-Annual	%(plant)s	{}
+%(pdatem10)s  %(yr)s  1 Tillage    OpCropDef.TAND0002    {0.101600, 2}
+%(pdatem5)s  %(yr)s  1 Tillage    OpCropDef.FCSTACDP    {0.101600, 1}
+%(pdate)s  %(yr)s  1 Tillage    OpCropDef.PLDDO    {0.050800, 2}
+%(pdate)s  %(yr)s  1 Plant-Annual    %(plant)s     {0.762000}
+10  10  %(yr)s  1 Harvest-Annual    %(plant)s    {}
 11  1  %(yr)s  1 Tillage        OpCropDef.MOPL  {0.203200, 1}
diff --git a/scripts/import/blocks/C1.txt b/scripts/import/blocks/C1.txt
@@ -1,3 +1,3 @@
-%(pdate)s %(yr)s  1 Tillage	OpCropDef.PLNTFC	{0.050800, 2}
-%(pdate)s %(yr)s  1 Plant-Annual	%(plant)s	 {0.762000}
-10  15 %(yr)s  1 Harvest-Annual	%(plant)s	{}
+%(pdate)s %(yr)s  1 Tillage    OpCropDef.PLNTFC    {0.050800, 2}
+%(pdate)s %(yr)s  1 Plant-Annual    %(plant)s     {0.762000}
+10  15 %(yr)s  1 Harvest-Annual    %(plant)s    {}
diff --git a/scripts/import/blocks/C2.txt b/scripts/import/blocks/C2.txt
@@ -1,5 +1,5 @@
 %(pdatem10)s  %(yr)s  1 Tillage OpCropDef.FCSTACDP      {0.101600, 2}
-%(pdate)s  %(yr)s  1 Tillage	OpCropDef.PLDDO	{0.050800, 2}
-%(pdate)s  %(yr)s  1 Plant-Annual	%(plant)s	 {0.762000}
-10  15  %(yr)s  1 Harvest-Annual	%(plant)s	{}
-11  1  %(yr)s  1 Tillage	OpCropDef.CHISSTSP	{0.203200, 1}
+%(pdate)s  %(yr)s  1 Tillage    OpCropDef.PLDDO    {0.050800, 2}
+%(pdate)s  %(yr)s  1 Plant-Annual    %(plant)s     {0.762000}
+10  15  %(yr)s  1 Harvest-Annual    %(plant)s    {}
+11  1  %(yr)s  1 Tillage    OpCropDef.CHISSTSP    {0.203200, 1}
diff --git a/scripts/import/blocks/C3.txt b/scripts/import/blocks/C3.txt
@@ -1,6 +1,6 @@
 %(pdatem10)s  %(yr)s  1 Tillage  OpCropDef.TAND0002      {0.101600, 2}
 %(pdatem5)s  %(yr)s  1 Tillage OpCropDef.FCSTACDP      {0.101600, 2}
-%(pdate)s  %(yr)s  1 Tillage	OpCropDef.PLDDO	{0.050800, 2}
-%(pdate)s  %(yr)s  1 Plant-Annual	%(plant)s	 {0.762000}
-10  15  %(yr)s  1 Harvest-Annual	%(plant)s	{}
-11  1  %(yr)s  1 Tillage  OpCropDef.TAND0002      {0.101600, 2}
+%(pdate)s  %(yr)s  1 Tillage    OpCropDef.PLDDO    {0.050800, 2}
+%(pdate)s  %(yr)s  1 Plant-Annual    %(plant)s     {0.762000}
+10  15  %(yr)s  1 Harvest-Annual    %(plant)s    {}
+11  1  %(yr)s  1 Tillage  OpCropDef.CHISSTSP    {0.203200, 1}
diff --git a/scripts/import/blocks/C4.txt b/scripts/import/blocks/C4.txt
@@ -1,6 +1,7 @@
-%(pdatem10)s  %(yr)s  1 Tillage	OpCropDef.TAND0002	{0.101600, 2}
-%(pdatem5)s  %(yr)s  1 Tillage	OpCropDef.FCSTACDP	{0.101600, 2}
-%(pdate)s  %(yr)s  1 Tillage	OpCropDef.PLDDO	{0.050800, 2}
-%(pdate)s  %(yr)s  1 Plant-Annual	%(plant)s	 {0.762000}
-10  15  %(yr)s  1 Harvest-Annual	%(plant)s	{}
-11  1  %(yr)s  1 Tillage	OpCropDef.CHISSTSP	{0.203200, 1}
+%(pdatem15)s  %(yr)s  1 Tillage    OpCropDef.TAND0002    {0.101600, 2}
+%(pdatem10)s  %(yr)s  1 Tillage    OpCropDef.TAND0002    {0.101600, 2}
+%(pdatem5)s  %(yr)s  1 Tillage    OpCropDef.FCSTACDP    {0.101600, 2}
+%(pdate)s  %(yr)s  1 Tillage    OpCropDef.PLDDO    {0.050800, 2}
+%(pdate)s  %(yr)s  1 Plant-Annual    %(plant)s     {0.762000}
+10  15  %(yr)s  1 Harvest-Annual    %(plant)s    {}
+11  1  %(yr)s  1 Tillage    OpCropDef.CHISSTSP    {0.203200, 1}
diff --git a/scripts/import/blocks/C5.txt b/scripts/import/blocks/C5.txt
@@ -1,7 +1,5 @@
-%(pdatem15)s  %(yr)s  1 Tillage	OpCropDef.TAND0002	{0.101600, 2}
-%(pdatem10)s  %(yr)s  1 Tillage	OpCropDef.TAND0002	{0.101600, 2}
-%(pdatem5)s  %(yr)s  1 Tillage	OpCropDef.FCSTACDP	{0.101600, 2}
-%(pdate)s  %(yr)s  1 Tillage	OpCropDef.PLDDO	{0.050800, 2}
-%(pdate)s  %(yr)s  1 Plant-Annual	%(plant)s	 {0.762000}
-10  15  %(yr)s  1 Harvest-Annual	%(plant)s	{}
-11  1  %(yr)s  1 Tillage	OpCropDef.CHISSTSP	{0.203200, 2}
+%(pdatem5)s  %(yr)s  1 Tillage    OpCropDef.FCSTACDP    {0.101600, 2}
+%(pdate)s  %(yr)s  1 Tillage    OpCropDef.PLDDO    {0.050800, 2}
+%(pdate)s  %(yr)s  1 Plant-Annual    %(plant)s     {0.762000}
+10  15  %(yr)s  1 Harvest-Annual    %(plant)s    {}
+11  1  %(yr)s  1 Tillage    OpCropDef.CHISSTSP    {0.203200, 2}
diff --git a/scripts/import/blocks/C6.txt b/scripts/import/blocks/C6.txt
@@ -1,6 +1,6 @@
-%(pdatem10)s  %(yr)s  1 Tillage	OpCropDef.TAND0002	{0.101600, 2}
-%(pdatem5)s  %(yr)s  1 Tillage	OpCropDef.FCSTACDP	{0.101600, 2}
-%(pdate)s  %(yr)s  1 Tillage	OpCropDef.PLDDO	{0.050800, 2}
-%(pdate)s  %(yr)s  1 Plant-Annual	%(plant)s	 {0.762000}
-10  15  %(yr)s  1 Harvest-Annual	%(plant)s	{}
+%(pdatem10)s  %(yr)s  1 Tillage    OpCropDef.TAND0002    {0.101600, 2}
+%(pdatem5)s  %(yr)s  1 Tillage    OpCropDef.FCSTACDP    {0.101600, 2}
+%(pdate)s  %(yr)s  1 Tillage    OpCropDef.PLDDO    {0.050800, 2}
+%(pdate)s  %(yr)s  1 Plant-Annual    %(plant)s     {0.762000}
+10  15  %(yr)s  1 Harvest-Annual    %(plant)s    {}
 11  1  %(yr)s  1 Tillage        OpCropDef.MOPL  {0.203200, 1}
diff --git a/scripts/import/blocks/L1.txt b/scripts/import/blocks/L1.txt
@@ -1,3 +1,3 @@
-%(pdate)s  %(yr)s  1 Tillage	OpCropDef.PLNTFC	{0.050000, 2}
-%(pdate)s  %(yr)s  1 Plant-Annual	%(plant)s	 {0.762000}
-10  10  %(yr)s  1 Harvest-Annual	%(plant)s	{}
+%(pdate)s  %(yr)s  1 Tillage    OpCropDef.PLNTFC    {0.050000, 2}
+%(pdate)s  %(yr)s  1 Plant-Annual    %(plant)s     {0.762000}
+10  10  %(yr)s  1 Harvest-Annual    %(plant)s    {}
diff --git a/scripts/import/blocks/L2.txt b/scripts/import/blocks/L2.txt
@@ -1,5 +1,5 @@
 %(pdatem10)s  %(yr)s  1 Tillage OpCropDef.FCSTACDP      {0.101600, 2}
-%(pdate)s  %(yr)s  1 Tillage	OpCropDef.PLDDO	{0.050800, 2}
-%(pdate)s  %(yr)s  1 Plant-Annual	%(plant)s	 {0.762000}
-10  10  %(yr)s  1 Harvest-Annual	%(plant)s	{}
-11  1  %(yr)s  1 Tillage	OpCropDef.CHISSTSP	{0.203200, 2}
+%(pdate)s  %(yr)s  1 Tillage    OpCropDef.PLDDO    {0.050800, 2}
+%(pdate)s  %(yr)s  1 Plant-Annual    %(plant)s     {0.762000}
+10  10  %(yr)s  1 Harvest-Annual    %(plant)s    {}
+11  1  %(yr)s  1 Tillage    OpCropDef.CHISSTSP    {0.203200, 2}
diff --git a/scripts/import/blocks/L3.txt b/scripts/import/blocks/L3.txt
@@ -1,5 +1,5 @@
-%(pdatem10)s  %(yr)s  1 Tillage	OpCropDef.FCSTACDP	{0.101600, 1}
-%(pdate)s  %(yr)s  1 Tillage	OpCropDef.PLDDO	{0.050800, 2}
-%(pdate)s  %(yr)s  1 Plant-Annual	%(plant)s	 {0.762000}
-10  10  %(yr)s  1 Harvest-Annual	%(plant)s	{}
-11  1  %(yr)s  1 Tillage	OpCropDef.CHISSTSP	{0.203200, 2}
+%(pdatem10)s  %(yr)s  1 Tillage    OpCropDef.FCSTACDP    {0.101600, 1}
+%(pdate)s  %(yr)s  1 Tillage    OpCropDef.PLDDO    {0.050800, 2}
+%(pdate)s  %(yr)s  1 Plant-Annual    %(plant)s     {0.762000}
+10  10  %(yr)s  1 Harvest-Annual    %(plant)s    {}
+11  1  %(yr)s  1 Tillage    OpCropDef.CHISSTSP    {0.203200, 2}
diff --git a/scripts/import/blocks/L4.txt b/scripts/import/blocks/L4.txt
@@ -1,7 +1,7 @@
 %(pdatem10)s  %(yr)s  1 Tillage OpCropDef.FCSTACDP      {0.101600, 2}
 %(pdatem5)s  %(yr)s  1 Tillage  OpCropDef.TAND0002      {0.101600, 2}
 %(pdate)s  %(yr)s  1 Tillage    OpCropDef.TAND0002      {0.101600, 2}
-%(pdate)s  %(yr)s  1 Tillage	OpCropDef.PLDDO	{0.050800, 2}
-%(pdate)s  %(yr)s  1 Plant-Annual	%(plant)s	 {0.762000}
-10  10  %(yr)s  1 Harvest-Annual	%(plant)s	{}
-11  1  %(yr)s  1 Tillage	OpCropDef.CHISSTSP	{0.203200, 2}
+%(pdate)s  %(yr)s  1 Tillage    OpCropDef.PLDDO    {0.050800, 2}
+%(pdate)s  %(yr)s  1 Plant-Annual    %(plant)s     {0.762000}
+10  10  %(yr)s  1 Harvest-Annual    %(plant)s    {}
+11  1  %(yr)s  1 Tillage    OpCropDef.CHISSTSP    {0.203200, 2}
diff --git a/scripts/import/blocks/L5.txt b/scripts/import/blocks/L5.txt
@@ -1,6 +1,6 @@
-%(pdatem10)s  %(yr)s  1 Tillage	OpCropDef.FCSTACDP	{0.101600, 1}
-%(pdatem5)s  %(yr)s  1 Tillage	OpCropDef.TAND0002	{0.101600, 2}
-%(pdate)s  %(yr)s  1 Tillage	OpCropDef.PLDDO	{0.050800, 2}
-%(pdate)s  %(yr)s  1 Plant-Annual	%(plant)s	 {0.762000}
-10  10  %(yr)s  1 Harvest-Annual	%(plant)s	{}
+%(pdatem10)s  %(yr)s  1 Tillage    OpCropDef.FCSTACDP    {0.101600, 1}
+%(pdatem5)s  %(yr)s  1 Tillage    OpCropDef.TAND0002    {0.101600, 2}
+%(pdate)s  %(yr)s  1 Tillage    OpCropDef.PLDDO    {0.050800, 2}
+%(pdate)s  %(yr)s  1 Plant-Annual    %(plant)s     {0.762000}
+10  10  %(yr)s  1 Harvest-Annual    %(plant)s    {}
 11  1  %(yr)s  1 Tillage        OpCropDef.MOPL  {0.203200, 1}
diff --git a/scripts/import/blocks/L6.txt b/scripts/import/blocks/L6.txt
@@ -1,6 +1,6 @@
-%(pdatem10)s  %(yr)s  1 Tillage	OpCropDef.FCSTACDP	{0.101600, 1}
-%(pdatem5)s  %(yr)s  1 Tillage	OpCropDef.TAND0002	{0.101600, 2}
-%(pdate)s  %(yr)s  1 Tillage	OpCropDef.PLDDO	{0.050800, 2}
-%(pdate)s  %(yr)s  1 Plant-Annual	%(plant)s	 {0.762000}
-10  10  %(yr)s  1 Harvest-Annual	%(plant)s	{}
-11  1  %(yr)s  1 Tillage	OpCropDef.CHISSTSP	{0.203200, 2}
+%(pdatem10)s  %(yr)s  1 Tillage    OpCropDef.FCSTACDP    {0.101600, 1}
+%(pdatem5)s  %(yr)s  1 Tillage    OpCropDef.TAND0002    {0.101600, 2}
+%(pdate)s  %(yr)s  1 Tillage    OpCropDef.PLDDO    {0.050800, 2}
+%(pdate)s  %(yr)s  1 Plant-Annual    %(plant)s     {0.762000}
+10  10  %(yr)s  1 Harvest-Annual    %(plant)s    {}
+11  1  %(yr)s  1 Tillage    OpCropDef.CHISSTSP    {0.203200, 2}
diff --git a/scripts/import/blocks/P0.txt b/scripts/import/blocks/P0.txt
@@ -1,3 +1,3 @@
-6  1  %(yr)s  1 Cut-Perennial	CropDef.ALFALFA	{}
-7  15  %(yr)s  1 Cut-Perennial	CropDef.ALFALFA	{}
-9  1  %(yr)s  1 Cut-Perennial	CropDef.ALFALFA	{}
+6  1  %(yr)s  1 Cut-Perennial    CropDef.ALFALFA    {}
+7  15  %(yr)s  1 Cut-Perennial    CropDef.ALFALFA    {}
+9  1  %(yr)s  1 Cut-Perennial    CropDef.ALFALFA    {}
diff --git a/scripts/import/blocks/P1.txt b/scripts/import/blocks/P1.txt
@@ -1,3 +1,3 @@
-6  1  %(yr)s  1 Cut-Perennial	CropDef.ALFALFA	{}
-7  15  %(yr)s  1 Cut-Perennial	CropDef.ALFALFA	{}
-9  1  %(yr)s  1 Cut-Perennial	CropDef.ALFALFA	{}
+6  1  %(yr)s  1 Cut-Perennial    CropDef.ALFALFA    {}
+7  15  %(yr)s  1 Cut-Perennial    CropDef.ALFALFA    {}
+9  1  %(yr)s  1 Cut-Perennial    CropDef.ALFALFA    {}
diff --git a/scripts/import/blocks/P2.txt b/scripts/import/blocks/P2.txt
@@ -1,3 +1,3 @@
-6  1  %(yr)s  1 Cut-Perennial	CropDef.ALFALFA	{}
-7  15  %(yr)s  1 Cut-Perennial	CropDef.ALFALFA	{}
-9  1  %(yr)s  1 Cut-Perennial	CropDef.ALFALFA	{}
+6  1  %(yr)s  1 Cut-Perennial    CropDef.ALFALFA    {}
+7  15  %(yr)s  1 Cut-Perennial    CropDef.ALFALFA    {}
+9  1  %(yr)s  1 Cut-Perennial    CropDef.ALFALFA    {}
diff --git a/scripts/import/blocks/P3.txt b/scripts/import/blocks/P3.txt
@@ -1,3 +1,3 @@
-6  1  %(yr)s  1 Cut-Perennial	CropDef.ALFALFA	{}
-7  15  %(yr)s  1 Cut-Perennial	CropDef.ALFALFA	{}
-9  1  %(yr)s  1 Cut-Perennial	CropDef.ALFALFA	{}
+6  1  %(yr)s  1 Cut-Perennial    CropDef.ALFALFA    {}
+7  15  %(yr)s  1 Cut-Perennial    CropDef.ALFALFA    {}
+9  1  %(yr)s  1 Cut-Perennial    CropDef.ALFALFA    {}
diff --git a/scripts/import/blocks/P4.txt b/scripts/import/blocks/P4.txt
@@ -1,3 +1,3 @@
-6  1  %(yr)s  1 Cut-Perennial	CropDef.ALFALFA	{}
-7  15  %(yr)s  1 Cut-Perennial	CropDef.ALFALFA	{}
-9  1  %(yr)s  1 Cut-Perennial	CropDef.ALFALFA	{}
+6  1  %(yr)s  1 Cut-Perennial    CropDef.ALFALFA    {}
+7  15  %(yr)s  1 Cut-Perennial    CropDef.ALFALFA    {}
+9  1  %(yr)s  1 Cut-Perennial    CropDef.ALFALFA    {}
diff --git a/scripts/import/blocks/P5.txt b/scripts/import/blocks/P5.txt
@@ -1,3 +1,3 @@
-6  1  %(yr)s  1 Cut-Perennial	CropDef.ALFALFA	{}
-7  15  %(yr)s  1 Cut-Perennial	CropDef.ALFALFA	{}
-9  1  %(yr)s  1 Cut-Perennial	CropDef.ALFALFA	{}
+6  1  %(yr)s  1 Cut-Perennial    CropDef.ALFALFA    {}
+7  15  %(yr)s  1 Cut-Perennial    CropDef.ALFALFA    {}
+9  1  %(yr)s  1 Cut-Perennial    CropDef.ALFALFA    {}
diff --git a/scripts/import/blocks/P6.txt b/scripts/import/blocks/P6.txt
@@ -1,3 +1,3 @@
-6  1  %(yr)s  1 Cut-Perennial	CropDef.ALFALFA	{}
-7  15  %(yr)s  1 Cut-Perennial	CropDef.ALFALFA	{}
-9  1  %(yr)s  1 Cut-Perennial	CropDef.ALFALFA	{}
+6  1  %(yr)s  1 Cut-Perennial    CropDef.ALFALFA    {}
+7  15  %(yr)s  1 Cut-Perennial    CropDef.ALFALFA    {}
+9  1  %(yr)s  1 Cut-Perennial    CropDef.ALFALFA    {}
diff --git a/scripts/import/blocks/R1.txt b/scripts/import/blocks/R1.txt
@@ -1,9 +1,9 @@
-4  1  %(yr)s  1 Tillage	OpCropDef.FIEL0001	{0.050000, 2}
-4  3  %(yr)s  1 Tillage	OpCropDef.FIEL0001	{0.050000, 2}
-4  3  %(yr)s  1 Tillage	OpCropDef.HASPTCT	{0.050000, 2}
-4  5  %(yr)s  1 Tillage	OpCropDef.ANHYDROS	{0.050000, 2}
-4  5  %(yr)s  1 Tillage	OpCropDef.HASPTCT	{0.050000, 2}
-4  10  %(yr)s  1 Tillage	OpCropDef.DRDDO	{0.050000, 2}
-4  10  %(yr)s  1 Plant-Annual	CropDef.Bar_8319	 {1.200000}
-8  15  %(yr)s  1 Harvest-Annual	CropDef.Bar_8319	{}
-10  15  %(yr)s  1 Tillage	OpCropDef.CHISCOST	{0.050000, 2}
+4  1  %(yr)s  1 Tillage    OpCropDef.FIEL0001    {0.050000, 2}
+4  3  %(yr)s  1 Tillage    OpCropDef.FIEL0001    {0.050000, 2}
+4  3  %(yr)s  1 Tillage    OpCropDef.HASPTCT    {0.050000, 2}
+4  5  %(yr)s  1 Tillage    OpCropDef.ANHYDROS    {0.050000, 2}
+4  5  %(yr)s  1 Tillage    OpCropDef.HASPTCT    {0.050000, 2}
+4  10  %(yr)s  1 Tillage    OpCropDef.DRDDO    {0.050000, 2}
+4  10  %(yr)s  1 Plant-Annual    CropDef.Bar_8319     {1.200000}
+8  15  %(yr)s  1 Harvest-Annual    CropDef.Bar_8319    {}
+10  15  %(yr)s  1 Tillage    OpCropDef.CHISCOST    {0.050000, 2}
diff --git a/scripts/import/blocks/R2.txt b/scripts/import/blocks/R2.txt
@@ -1,9 +1,9 @@
-4  1  %(yr)s  1 Tillage	OpCropDef.FIEL0001	{0.050000, 2}
-4  3  %(yr)s  1 Tillage	OpCropDef.FIEL0001	{0.050000, 2}
-4  3  %(yr)s  1 Tillage	OpCropDef.HASPTCT	{0.050000, 2}
-4  5  %(yr)s  1 Tillage	OpCropDef.ANHYDROS	{0.050000, 2}
-4  5  %(yr)s  1 Tillage	OpCropDef.HASPTCT	{0.050000, 2}
-4  10  %(yr)s  1 Tillage	OpCropDef.DRDDO	{0.050000, 2}
-4  10  %(yr)s  1 Plant-Annual	CropDef.Bar_8319	 {1.200000}
-8  15  %(yr)s  1 Harvest-Annual	CropDef.Bar_8319	{}
-10  15  %(yr)s  1 Tillage	OpCropDef.CHISCOST	{0.050000, 2}
+4  1  %(yr)s  1 Tillage    OpCropDef.FIEL0001    {0.050000, 2}
+4  3  %(yr)s  1 Tillage    OpCropDef.FIEL0001    {0.050000, 2}
+4  3  %(yr)s  1 Tillage    OpCropDef.HASPTCT    {0.050000, 2}
+4  5  %(yr)s  1 Tillage    OpCropDef.ANHYDROS    {0.050000, 2}
+4  5  %(yr)s  1 Tillage    OpCropDef.HASPTCT    {0.050000, 2}
+4  10  %(yr)s  1 Tillage    OpCropDef.DRDDO    {0.050000, 2}
+4  10  %(yr)s  1 Plant-Annual    CropDef.Bar_8319     {1.200000}
+8  15  %(yr)s  1 Harvest-Annual    CropDef.Bar_8319    {}
+10  15  %(yr)s  1 Tillage    OpCropDef.CHISCOST    {0.050000, 2}
diff --git a/scripts/import/blocks/R3.txt b/scripts/import/blocks/R3.txt
@@ -1,9 +1,9 @@
-4  1  %(yr)s  1 Tillage	OpCropDef.FIEL0001	{0.050000, 2}
-4  3  %(yr)s  1 Tillage	OpCropDef.FIEL0001	{0.050000, 2}
-4  3  %(yr)s  1 Tillage	OpCropDef.HASPTCT	{0.050000, 2}
-4  5  %(yr)s  1 Tillage	OpCropDef.ANHYDROS	{0.050000, 2}
-4  5  %(yr)s  1 Tillage	OpCropDef.HASPTCT	{0.050000, 2}
-4  10  %(yr)s  1 Tillage	OpCropDef.DRDDO	{0.050000, 2}
-4  10  %(yr)s  1 Plant-Annual	CropDef.Bar_8319	 {1.200000}
-8  15  %(yr)s  1 Harvest-Annual	CropDef.Bar_8319	{}
-10  15  %(yr)s  1 Tillage	OpCropDef.CHISCOST	{0.050000, 2}
+4  1  %(yr)s  1 Tillage    OpCropDef.FIEL0001    {0.050000, 2}
+4  3  %(yr)s  1 Tillage    OpCropDef.FIEL0001    {0.050000, 2}
+4  3  %(yr)s  1 Tillage    OpCropDef.HASPTCT    {0.050000, 2}
+4  5  %(yr)s  1 Tillage    OpCropDef.ANHYDROS    {0.050000, 2}
+4  5  %(yr)s  1 Tillage    OpCropDef.HASPTCT    {0.050000, 2}
+4  10  %(yr)s  1 Tillage    OpCropDef.DRDDO    {0.050000, 2}
+4  10  %(yr)s  1 Plant-Annual    CropDef.Bar_8319     {1.200000}
+8  15  %(yr)s  1 Harvest-Annual    CropDef.Bar_8319    {}
+10  15  %(yr)s  1 Tillage    OpCropDef.CHISCOST    {0.050000, 2}
diff --git a/scripts/import/blocks/R4.txt b/scripts/import/blocks/R4.txt
@@ -1,9 +1,9 @@
-4  1  %(yr)s  1 Tillage	OpCropDef.FIEL0001	{0.050000, 2}
-4  3  %(yr)s  1 Tillage	OpCropDef.FIEL0001	{0.050000, 2}
-4  3  %(yr)s  1 Tillage	OpCropDef.HASPTCT	{0.050000, 2}
-4  5  %(yr)s  1 Tillage	OpCropDef.ANHYDROS	{0.050000, 2}
-4  5  %(yr)s  1 Tillage	OpCropDef.HASPTCT	{0.050000, 2}
-4  10  %(yr)s  1 Tillage	OpCropDef.DRDDO	{0.050000, 2}
-4  10  %(yr)s  1 Plant-Annual	CropDef.Bar_8319	 {1.200000}
-8  15  %(yr)s  1 Harvest-Annual	CropDef.Bar_8319	{}
-10  15  %(yr)s  1 Tillage	OpCropDef.CHISCOST	{0.050000, 2}
+4  1  %(yr)s  1 Tillage    OpCropDef.FIEL0001    {0.050000, 2}
+4  3  %(yr)s  1 Tillage    OpCropDef.FIEL0001    {0.050000, 2}
+4  3  %(yr)s  1 Tillage    OpCropDef.HASPTCT    {0.050000, 2}
+4  5  %(yr)s  1 Tillage    OpCropDef.ANHYDROS    {0.050000, 2}
+4  5  %(yr)s  1 Tillage    OpCropDef.HASPTCT    {0.050000, 2}
+4  10  %(yr)s  1 Tillage    OpCropDef.DRDDO    {0.050000, 2}
+4  10  %(yr)s  1 Plant-Annual    CropDef.Bar_8319     {1.200000}
+8  15  %(yr)s  1 Harvest-Annual    CropDef.Bar_8319    {}
+10  15  %(yr)s  1 Tillage    OpCropDef.CHISCOST    {0.050000, 2}