Merge pull request #41 from JaimeCalzadaNOAA/fix/windforcing_set_wtiminc

fix setting interval

adcircpy/forcing/base.py

@@ -1,8 +1,22 @@
 from abc import ABC, abstractmethod
+from datetime import timedelta
 from os import PathLike
 
 
 class Forcing(ABC):
+    def __init__(self, interval: timedelta):
+        self.interval = interval
+
     @abstractmethod
     def write(self, directory: PathLike, overwrite: bool = False):
         raise NotImplementedError
+
+    @property
+    def interval(self) -> timedelta:
+        return self.__interval
+
+    @interval.setter
+    def interval(self, interval: timedelta):
+        if not isinstance(interval, timedelta):
+            interval = timedelta(seconds=interval)
+        self.__interval = interval

adcircpy/forcing/waves/base.py

@@ -6,8 +6,8 @@
 
 class WaveForcing(Forcing, ABC):
     def __init__(self, nrs: int, interval_seconds: int):
+        super().__init__(interval_seconds)
         self.NRS = nrs
-        self.RSTIMINC = interval_seconds
 
     @abstractmethod
     def write(self, directory: PathLike, overwrite: bool = False):

adcircpy/forcing/winds/base.py

@@ -6,8 +6,8 @@
 
 class WindForcing(Forcing, ABC):
     def __init__(self, nws: int, interval_seconds: int):
+        super().__init__(interval_seconds)
         self.NWS = nws
-        self.WTIMINC = interval_seconds
 
     @abstractmethod
     def write(self, directory: PathLike, overwrite: bool = False):

adcircpy/fort15.py

@@ -987,15 +987,15 @@ def REFTIM(self):
     @property
     def WTIMINC(self):
         if self.NWS not in [0, 1, 9, 11]:
-            return self.wind_forcing.WTIMINC
+            return int(self.wind_forcing.interval / timedelta(seconds=1))
         else:
             return 0
 
     @property
     def RSTIMINC(self):
         if self.NRS in [1, 3, 4, 5]:
             if self.wave_forcing is not None:
-                return self.wave_forcing.RSTIMINC
+                return int(self.wave_forcing.interval / timedelta(seconds=1))
             else:
                 return self.WTIMINC
         else: