Merge pull request #30 from cuspaceflight/new-wind

Just can't stop breaking wind

Author: jagoosw

.gitignore

@@ -27,3 +27,4 @@ output.json
 *.NC
 *.anl
 data/pyro.json
+pyro_venv/

README.md

@@ -1,5 +1,5 @@
 # CamPyRoS - A 6DOF Rocket Trajectory Simulator
-[![DOI](https://zenodo.org/badge/308847422.svg)](https://zenodo.org/badge/latestdoi/308847422) [![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
+[![DOI](https://zenodo.org/badge/308847422.svg)](https://zenodo.org/badge/latestdoi/308847422) [![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)[![Testing](https://github.com/cuspaceflight/CamPyRoS/actions/workflows/testcase.yml/badge.svg)](https://github.com/cuspaceflight/CamPyRoS/actions/workflows/testcase.yml)
 
 CamPyRoS (Cambridge Python Rocketry Simulator) is a Python package which provides fully featured rocket trajectory simulation including features like:
 - 6 degrees of freedom (3 translational, 3 rotational)
@@ -22,27 +22,11 @@ Currently not all dependancies are supported by the same install methods so the
 
 `pip install git+https://github.com/cuspaceflight/CamPyRoS.git`  
 
-The "wind" and "statistics" modules will not run. Statistics has a dependancy not fully supported by windows, to install it:
+Statistics has a dependancy not fully supported by windows, to install it:
 
 `pip install ray` on most platforms, for Windows problems see [here](https://docs.ray.io/en/master/installation.html).
 
-Wind depends on a library called iris which can only be installed with conda:
-
-`conda install iris, iris_grib`
-
-> Note: after some more testing this won't work for anyone on Windows, I am in the process fo sorting this out (the problem is a codec dependancy which there is no way for us to fix) by writing an library to read the other GFS distrobution method, see [gfspy](https://github.com/jagoosw/gfspy). You can still run and contribute without using the wind module. If you really want to use the wind module please [email](jagoosw@protonmail.com) or message me and we can try and sort out access to something remote you can use to run it. 
-
-This may then demand you install another library when you try to run it:
-
-`pip install eccodes-python`
-
-Alternativly you can download this repository and move it to either your system path or somewhere you will exclusivly use it from then:
-
-`conda env create -f enviroment.yml -n <name>`
-
-`conda activate <name>`
-
-From within the downloaded folder.
+If you don't install this the statistics module will run but only single threaded which will be *extremely* slow.
 
 ## Usage
 

Stats Model Example.ipynb

@@ -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,
         )
 
 
@@ -441,7 +433,7 @@ def fdot(self, time, fn):
         v_relative_wind_i = direction_l2i(
             (
                 i2airspeed(pos_i, vel_i, self.launch_site, time)
-                - self.launch_site.wind.get_wind(lat, long, alt)
+                - self.launch_site.wind.get_wind(lat, long, alt,self.time)
             ),
             self.launch_site,
             time,
@@ -684,7 +676,7 @@ def run(self, max_time=1000, debug=False, to_json=False):
             else:
                 lat, long, alt = i2lla(self.pos_i, self.time)
                 wind_inertial = vel_l2i(
-                    self.launch_site.wind.get_wind(lat, long, alt),
+                    self.launch_site.wind.get_wind(lat, long, alt, self.time),
                     self.launch_site,
                     self.time,
                 )

campyros/main.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,10 +9,12 @@
 )
 import campyros as pyro
 from campyros import statistical as stats
+from campyros import wind
 import csv
 import time
 import numpy as np
 import pandas as pd
+from datetime import date, timedelta
 
 __copyright__ = """
 
@@ -112,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(
@@ -203,6 +204,13 @@ 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,6 +224,17 @@ def test_stats(self):
             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_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_wind(-239, -923, -292728238)
+        self.assertEqual(0, wind2_val[0])
+        self.assertEqual(0, wind2_val[1])
+
 
 if __name__ == "__main__":
     unittest.main()