Textual Edits to 12.4

This update does two things: 1) Fixes some typos in the 12.4 explanation document. 2) Changed the version name from 12_4E5P to 12_4TestTracks to distinguish from the full 12_4 dataset.
alexcrawford0927 · Sep 27, 2021 · 0d69322 · 0d69322
1 parent e891802
commit 0d69322
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 14 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/Cyclone Tracking Description - Version 12.4.docx b/Cyclone Tracking Description - Version 12.4.docx
diff --git a/Version 12_4 Scripts/C3_CycloneDetection_12_4.py b/Version 12_4 Scripts/C3_CycloneDetection_12_4.py
@@ -42,8 +42,8 @@
 print("Setting up environment")
 path = "/Volumes/Cressida"
 dataset = "ERA5"
-verd = "12_4E5" # Detection Version
-vert = 'P' # Tracking Version
+verd = "12_4Test" # Detection Version
+vert = 'Tracks' # Tracking Version
 spres = 100 # Spatial resolution (in km)
 
 inpath = path+"/"+dataset+"/SLP_EASE2_N0_"+str(spres)+"km"

diff --git a/Version 12_4 Scripts/C3_SystemDetection_12.py b/Version 12_4 Scripts/C3_SystemDetection_12.py
@@ -30,9 +30,9 @@
 Set up Environment
 *******************************************'''
 print("Setting up environment.")
-BBox = "" # use "" if performing on all cyclones
+subset = "" # use "" if performing on all cyclones
 
-inpath = "/Volumes/Cressida/CycloneTracking/tracking12_4E5P/"+BBox
+inpath = "/Volumes/Cressida/CycloneTracking/tracking12_4TestTracks/"+subset
 outpath = inpath
 
 '''*******************************************
@@ -67,12 +67,12 @@
     print (" " + Y + " - " + M)
 
     # Load Cyclone Tracks
-    ct = pd.read_pickle(inpath+"/CycloneTracks/"+Y+"/"+BBox+"cyclonetracks"+Y+M+".pkl")
+    ct = pd.read_pickle(inpath+"/CycloneTracks/"+Y+"/"+subset+"cyclonetracks"+Y+M+".pkl")
 
     # Create System Tracks
     if mt == reftime:
         cs, cs0 = md.cTrack2sTrack(ct,[],dateref,rg)
-        pd.to_pickle(cs,inpath+"/SystemTracks/"+Y+"/"+BBox+"systemtracks"+Y+M+".pkl")
+        pd.to_pickle(cs,inpath+"/SystemTracks/"+Y+"/"+subset+"systemtracks"+Y+M+".pkl")
 
     else:
         # Extract date for previous month
@@ -81,12 +81,12 @@
         M0 = mons[mt0[1]-1]
 
         # Load previous month's system tracks
-        cs0 = pd.read_pickle(inpath+"/SystemTracks/"+Y0+"/"+BBox+"systemtracks"+Y0+M0+".pkl")
+        cs0 = pd.read_pickle(inpath+"/SystemTracks/"+Y0+"/"+subset+"systemtracks"+Y0+M0+".pkl")
 
         # Create system tracks
         cs, cs0 = md.cTrack2sTrack(ct,cs0,dateref,rg)
-        pd.to_pickle(cs,inpath+"/SystemTracks/"+Y+"/"+BBox+"systemtracks"+Y+M+".pkl")
-        pd.to_pickle(cs0,inpath+"/SystemTracks/"+Y0+"/"+BBox+"systemtracks"+Y0+M0+".pkl")
+        pd.to_pickle(cs,inpath+"/SystemTracks/"+Y+"/"+subset+"systemtracks"+Y+M+".pkl")
+        pd.to_pickle(cs0,inpath+"/SystemTracks/"+Y0+"/"+subset+"systemtracks"+Y0+M0+".pkl")
 
     # Increment Time Step
     mt = md.timeAdd(mt,monthstep)

diff --git a/Version 12_4 Scripts/C4_Subset_Crossing_byGridMask_andLength_12.py b/Version 12_4 Scripts/C4_Subset_Crossing_byGridMask_andLength_12.py
@@ -40,7 +40,7 @@ def maxDistFromGenPnt(data):
 Set up Environment
 *******************************************'''
 path = "/Volumes/Cressida"
-inpath = path+"/CycloneTracking/tracking12_4E5P"
+inpath = path+"/CycloneTracking/tracking12_4TestTracks"
 outpath = inpath
 
 '''*******************************************

diff --git a/Version 12_4 Scripts/C5_CycloneStatSummary_12_V3_AllStorms.py b/Version 12_4 Scripts/C5_CycloneStatSummary_12_V3_AllStorms.py
@@ -29,7 +29,7 @@ def maxDistFromGenPnt(data):
 *******************************************'''
 BBoxNum = "" # Use "BBox##" or "" if no subset
 path = "/Volumes/Cressida"
-version = "12_4E5P"
+version = "12_4TestTracks"
 inpath = path+"/CycloneTracking/tracking"+version+"/"+BBoxNum
 regpath = path+"/Projections/EASE2_N0_25km_GenesisRegions.pkl"
 

diff --git a/Version 12_4 Scripts/C6_Track_Aggregation_BBox_v12_events.py b/Version 12_4 Scripts/C6_Track_Aggregation_BBox_v12_events.py
@@ -45,7 +45,7 @@
 print("Setting up environment.")
 bboxnum = "" # use "" if performing on all cyclones; or BBox##
 typ = "System"
-ver = "12_4E5P"
+ver = "12_4TestTracks"
 
 path = "/Volumes/Cressida"
 inpath = path+"/CycloneTracking/tracking"+ver

diff --git a/Version 12_4 Scripts/C6_Track_Aggregation_BBox_v12_intensity.py b/Version 12_4 Scripts/C6_Track_Aggregation_BBox_v12_intensity.py
@@ -37,7 +37,7 @@
 print("Setting up environment.")
 bboxnum = "" # use "" if performing on all cyclones; or BBox##
 typ = "System"
-ver = "12_4E5P"
+ver = "12_4TestTracks"
 
 path = "/Volumes/Cressida"
 inpath = path+"/CycloneTracking/tracking"+ver

diff --git a/Version 12_4 Scripts/C6_Track_Aggregation_BBox_v12_trkden.py b/Version 12_4 Scripts/C6_Track_Aggregation_BBox_v12_trkden.py
@@ -46,7 +46,7 @@
 print("Setting up environment.")
 bboxnum = "" # use "" if performing on all cyclones; or BBox##
 typ = "System"
-ver = "12_4E5P"
+ver = "12_4TestTracks"
 
 path = "/Volumes/Cressida"
 inpath = path+"/CycloneTracking/tracking"+ver