small updates

FireRun.py

 """ FireRun
 Module to control different runs
 """
-def Yearbatchrun(year,tst=None,ted=None,restart=False):
+def Yearbatchrun(year,region='',tst=None,ted=None,restart=False):
     ''' Run the code for each single year
     '''
     import FireMain,FireSummary,FireGdf_merge,FireGdf_sfs_merge,FireGdf_ign,FireGdf_final
-
     import time
 
     t1 = time.time()
     # set the start and end time
-    if tst is None: tst = (year,6,1,'AM')
-    if ted is None: ted = (year,8,31,'PM')
+    if tst is None: tst = (year,1,1,'AM')
+    if ted is None: ted = (year,12,31,'PM')
     # if year == 2012: tst = (year,1,20,'AM')
 
     # Run the time forward and record daily fire objects .pkl data and fire attributes .GeoJSON data
-    FireMain.Fire_Forward(tst=tst,ted=ted,restart=restart,region='AK')
+    FireMain.Fire_Forward(tst=tst,ted=ted,restart=True,region=region)
     t2 = time.time()
     print(f'{(t2-t1)/60.} minutes to run algorithm')
 
     # Run to save geojson files for each time step
-    FireGdf_merge.save_gdf_trng(tst=tst,ted=ted,fperim=True)
-    #FireGdf_merge.save_gdf_trng(tst=tst,ted=ted,fall=True)
-    FireGdf_merge.save_gdf_trng(tst=tst,ted=ted,NFP_txt=True)
+    FireGdf_merge.save_gdf_trng(tst=tst,ted=ted,fperim=True,fline=True,NFP_txt=True,region=region)
+    #FireGdf_merge.save_gdf_trng(tst=tst,ted=ted,fperim=True,region=region)
     t3 = time.time()
     print(f'{(t3-t2)/60.} minutes to save gpkg files')
     
     # Run to save ignition point layer for each time step
-    FireGdf_ign.save_gdf_trng(tst,ted)
-    FireGdf_final.save_gdf_trng(tst,ted)
+    FireGdf_ign.save_gdf_trng(tst,ted,region=region)
+    FireGdf_final.save_gdf_trng(tst,ted,region=region)
     t31 = time.time()
-    print(f'{(t31-t3)/60.} minutes to save ognitions and final perimeters')
+    print(f'{(t31-t3)/60.} minutes to save ignitions and final perimeters')
     
-    # Run to save large fire geosjon files for each time step
-    #FireGdf_sfs.save_gdf_trng(tst=tst,ted=ted,fperim=True)
-    FireGdf_sfs_merge.save_gdf_trng(ted=ted,fperim=True)
-    t4 = time.time()
-    print(f'{(t4-t31)/60.} minutes to save large fires')
+    # # Run to save large fire geosjon files for each time step
+    # #FireGdf_sfs.save_gdf_trng(tst=tst,ted=ted,fperim=True)
+    # FireGdf_sfs_merge.save_gdf_trng(ted=ted,fperim=True,region=region)
+    # t4 = time.time()
+    # print(f'{(t4-t31)/60.} minutes to save large fires')
     
     
 
-    # Run to save year end summary and file lists
-    FireSummary.save_sum_1d(tst,ted)
-    FireSummary.add_heritage(ted)
-    FireSummary.add_largefirelist(ted)
-    t5 = time.time()
-    print(f'{(t5-t4)/60.} minutes to generate summary')
+    # # Run to save year end summary and file lists
+    FireSummary.save_sum_1d(tst,ted,region)
+    # FireSummary.add_heritage(ted)
+    # FireSummary.add_largefirelist(ted)
+    # t5 = time.time()
+    # print(f'{(t5-t4)/60.} minutes to generate summary')
 
-    # Run to clean up large fire geojson files not needed
-    # FireGdf_sfs.yrend_clean(ted)
+    # # Run to clean up large fire geojson files not needed
+    # # FireGdf_sfs.yrend_clean(ted)
 
     t2 = time.time()
     print(f'{(t2-t1)/60.} minutes to run code')
@@ -63,4 +61,7 @@ if __name__ == "__main__":
         os.environ['GDAL_DATA'] = r'C:/Users/rebec/anaconda3/envs/py3work/Library/share/gdal' 
         os.environ['PROJ_LIB'] = r'C:/Users/rebec/anaconda3/envs/fireatlas/Library/share/proj' 
     
-    Yearbatchrun(2020)
+    year = 2017
+    region = ''
+    
+    Yearbatchrun(year, region)