seems to be working

Author: jagoosw

campyros/main.py

@@ -42,7 +42,7 @@
 from scipy.spatial.transform import Rotation
 import numexpr as ne
 
-from datetime import date
+from datetime import date, timedelta
 from ambiance import Atmosphere
 
 from .constants import r_earth, ang_vel_earth, f
@@ -222,11 +222,8 @@ def __init__(
         lat,
         variable_wind=True,
         default_wind=[0, 0, 0],
-        wind_data_loc="data/wind/gfs",
-        run_date=date.today().strftime("%Y%m%d"),
-        forcast_time="00",
-        forcast_plus_time="000",
-        fast_wind=False,
+        launch_datetime=(date.today()-timedelta(days=2)).strftime("%Y%m%d %H:%M"),
+        cache_Wind=False
     ):
         self.rail_length = rail_length
         self.rail_yaw = rail_yaw
@@ -235,15 +232,10 @@ def __init__(
         self.longi = longi
         self.lat = lat
         self.wind = Wind(
-            longi,
-            lat,
             variable=variable_wind,
             default=default_wind,
-            data_loc=wind_data_loc,
-            run_date=run_date,
-            forcast_time=forcast_time,
-            forcast_plus_time=forcast_plus_time,
-            fast=fast_wind,
+            datetime=launch_datetime,
+            cache=cache_Wind
         )
 
 

campyros/new_wind.py

@@ -122,18 +122,6 @@ def __init__(self, run_file):
         self.enviromental = data["enviromental"]
         self.thrust_error = data["thrust_error"]
         self.mass_vars = data["mass"]
-
-        self.wind_base = Wind(
-            self.launch_site_vars["long"][0],
-            self.launch_site_vars["lat"][0],
-            variable=bool(self.launch_site_vars["variable_wind"]),
-            run_date=self.launch_site_vars["run_date"],
-            forcast_time=self.launch_site_vars["run_time"],
-            forcast_plus_time=self.launch_site_vars["run_plus_time"],
-            fast=self.launch_site_vars["fast_wind"],
-        )
-
-        print(data["motor_file"])
         self.motor_data = load_motor(data["motor_file"])
         self.motor_base = Motor.from_novus(data["motor_file"], pos=data["motor_pos"])
 
@@ -156,8 +144,6 @@ def run_itteration(self, id, save_loc, debug=False):
         thrust_e = np.random.normal(1, self.thrust_error["magnitude"])
         motor.thrust_array = [t * thrust_e for t in motor.thrust_array]
 
-        wind = copy.copy(self.wind_base)  # Wind variability coming soon
-
         dry_mass = self.mass_vars["dry_mass"][0] * np.random.normal(
             1, self.mass_vars["dry_mass"][1]
         )
@@ -263,10 +249,8 @@ def run_itteration(self, id, save_loc, debug=False):
             lat=self.launch_site_vars["lat"][0]
             * np.random.normal(1, self.launch_site_vars["lat"][1]),
             variable_wind=bool(self.launch_site_vars["variable_wind"]),
-            run_date=self.launch_site_vars["run_date"],
-            forcast_plus_time=self.launch_site_vars["run_plus_time"],
-            forcast_time=self.launch_site_vars["run_time"],
-            fast_wind=bool(self.launch_site_vars["fast_wind"]),
+            launch_datetime=self.launch_site_vars["launch_datetime"],
+            cache_Wind=True
         )
 
         ###Parachute

campyros/statistical.py

@@ -1,5 +1,6 @@
 import unittest
-import sys, os
+import sys, os, json
+from datetime import date,timedelta,datetime
 
 sys.path.append(
     "/".join(
@@ -8,7 +9,7 @@
 )
 import campyros as pyro
 from campyros import statistical as stats
-from campyros import new_wind as wind
+from campyros import wind
 import csv
 import time
 import numpy as np
@@ -114,8 +115,6 @@
     longi=0.1,
     lat=52.1,
     variable_wind=False,
-    fast_wind=True,
-    run_date="20210216",
 )  # Use this version if you don't want to use the real wind (e.g. to test something else)
 
 parachute = pyro.Parachute(
@@ -138,7 +137,7 @@
     alt_poll_interval=1,
     parachute=parachute,
 )
-"""
+
 run = martlet4.run(debug=False)
 
 test_output = pyro.from_json("campyros/tests/test.json")
@@ -168,10 +167,10 @@
         parachute_ind_run = ind
     if "Cleared rail" in ev:
         rail_ind_run = ind
-"""
+
 
 class ExampleTest(unittest.TestCase):
-    """def test_time(self):
+    def test_time(self):
         self.assertAlmostEqual(run_time // 5, run.time.max() // 5, places=0)
 
     def test_apogee(self):
@@ -205,6 +204,11 @@ def test_parachute(self):
         )
 
     def test_stats(self):
+        with open("campyros/tests/test_stats.json",'r') as f:
+            stat_dat=json.load(f)
+        stat_dat["launch_site"]["launch_datetime"]=(date.today()-timedelta(days=2)).strftime("%Y%m%d %H:%M")
+        with open("campyros/tests/test_stats.json",'w') as f:
+            json.dump(stat_dat,f)
         stats_model = stats.StatisticalModel("campyros/tests/test_stats.json")
         ran = stats_model.run_model(test_mode=True, num_cpus=1)
         print(ran)
@@ -216,16 +220,16 @@ def test_stats(self):
             True,
             ran,
             msg="Statistical model run failed, no further information automatically available",
-        )"""
+        )
 
     def test_wind(self):
         wind1=wind.Wind((date.today()-timedelta(days=1)).strftime("%Y%m%d %H:%M"))
-        wind1_val=wind1.get(239,923,292728238)
-        self.assertIsInstance(wind1_val,type((0.0,0.0)))
-        self.assertEqual(2,len(wind1_val))
+        wind1_val=wind1.get_wind(239,923,292728238)
+        self.assertIsInstance(wind1_val,type(np.array([0.0,0.0])))
+        self.assertEqual(3,len(wind1_val))
 
         wind2=wind.Wind(variable=False)
-        wind2_val=wind2.get(-239,-923,-292728238)
+        wind2_val=wind2.get_wind(-239,-923,-292728238)
         self.assertEqual(0,wind2_val[0])
         self.assertEqual(0,wind2_val[1])