simapy 5.0.0.dev0__py3-none-any.whl → 5.2.0__py3-none-any.whl

simapy/metocean/blueprints/metocean.py

@@ -14,6 +14,6 @@ class MetoceanBlueprint(NamedEntityBlueprint):
         super().__init__(name,package_path,description)
         self.add_attribute(Attribute("description","string","",default=""))
         self.add_attribute(Attribute("name","string","name for the metocean data."))
-        self.add_attribute(BlueprintAttribute("hindcasts","metocean/hindcast/Hindcast","hindcast data.",True,Dimension("*")))
-        self.add_attribute(BlueprintAttribute("scatters","metocean/scatter/Scatter","scatter data.",True,Dimension("*")))
-        self.add_attribute(BlueprintAttribute("longterms","metocean/longTermStatistics/LongTermStats","scatter data.",True,Dimension("*")))
+        self.add_attribute(BlueprintAttribute("hindcasts","/hindcast/Hindcast","hindcast data.",True,Dimension("*")))
+        self.add_attribute(BlueprintAttribute("scatters","/scatter/Scatter","scatter data.",True,Dimension("*")))
+        self.add_attribute(BlueprintAttribute("longterms","/longTermStatistics/LongTermStats","scatter data.",True,Dimension("*")))

simapy/metocean/hindcast/blueprints/hindcast.py

@@ -15,8 +15,8 @@ class HindcastBlueprint(NamedEntityBlueprint):
         self.add_attribute(Attribute("description","string","",default=""))
         self.add_attribute(Attribute("name","string","name for the metocean data."))
         self.add_attribute(Attribute("date","string","date string.",Dimension("*")))
-        self.add_attribute(BlueprintAttribute("wave","metocean/hindcast/StochasticWave","wave models.",True,Dimension("*")))
-        self.add_attribute(BlueprintAttribute("wind","metocean/hindcast/StochasticWind","wind models.",True,Dimension("*")))
-        self.add_attribute(BlueprintAttribute("current","metocean/hindcast/StochasticCurrent","current models.",True,Dimension("*")))
         self.add_attribute(Attribute("latitude","number","",default=0.0))
-        self.add_attribute(Attribute("longitude","number","",default=0.0))
+        self.add_attribute(Attribute("longitude","number","",default=0.0))
+        self.add_attribute(BlueprintAttribute("wave","/hindcast/StochasticWave","wave models.",True,Dimension("*")))
+        self.add_attribute(BlueprintAttribute("wind","/hindcast/StochasticWind","wind models.",True,Dimension("*")))
+        self.add_attribute(BlueprintAttribute("current","/hindcast/StochasticCurrent","current models.",True,Dimension("*")))

simapy/metocean/hindcast/hindcast.py

@@ -19,18 +19,18 @@ class Hindcast(NamedEntity):
          (default "")
     name : str
          name for the metocean data.(default None)
-    date : ndarray
+    date : ndarray of str
          date string.
+    latitude : float
+         (default 0.0)
+    longitude : float
+         (default 0.0)
     wave : List[StochasticWave]
          wave models.
     wind : List[StochasticWind]
          wind models.
     current : List[StochasticCurrent]
          current models.
-    latitude : float
-         (default 0.0)
-    longitude : float
-         (default 0.0)
     """
 
     def __init__(self , description="", latitude=0.0, longitude=0.0, **kwargs):
@@ -38,11 +38,11 @@ class Hindcast(NamedEntity):
         self.description = description
         self.name = None
         self.date = []
+        self.latitude = latitude
+        self.longitude = longitude
         self.wave = list()
         self.wind = list()
         self.current = list()
-        self.latitude = latitude
-        self.longitude = longitude
         for key, value in kwargs.items():
             if not isinstance(value, Dict):
                 setattr(self, key, value)
@@ -87,6 +87,26 @@ class Hindcast(NamedEntity):
             raise ValueError("Expected array with 1 dimensions")
         self.__date = array
 
+    @property
+    def latitude(self) -> float:
+        """"""
+        return self.__latitude
+
+    @latitude.setter
+    def latitude(self, value: float):
+        """Set latitude"""
+        self.__latitude = float(value)
+
+    @property
+    def longitude(self) -> float:
+        """"""
+        return self.__longitude
+
+    @longitude.setter
+    def longitude(self, value: float):
+        """Set longitude"""
+        self.__longitude = float(value)
+
     @property
     def wave(self) -> List[StochasticWave]:
         """wave models."""
@@ -122,23 +142,3 @@ class Hindcast(NamedEntity):
         if not isinstance(value, Sequence):
             raise ValueError("Expected sequense, but was " , type(value))
         self.__current = value
-
-    @property
-    def latitude(self) -> float:
-        """"""
-        return self.__latitude
-
-    @latitude.setter
-    def latitude(self, value: float):
-        """Set latitude"""
-        self.__latitude = float(value)
-
-    @property
-    def longitude(self) -> float:
-        """"""
-        return self.__longitude
-
-    @longitude.setter
-    def longitude(self, value: float):
-        """Set longitude"""
-        self.__longitude = float(value)

simapy/metocean/hindcast/stochasticcurrent.py

@@ -16,9 +16,9 @@ class StochasticCurrent(NamedEntity):
          (default "")
     name : str
          name for the metocean data.(default None)
-    speed : ndarray
+    speed : ndarray of float
          mean current speed.
-    direction : ndarray
+    direction : ndarray of float
          current direction.
     level : float
          at this level, upward positive.(default 0.0)

simapy/metocean/hindcast/stochasticwave.py

@@ -16,13 +16,13 @@ class StochasticWave(NamedEntity):
          (default "")
     name : str
          name for the metocean data.(default None)
-    hs : ndarray
+    hs : ndarray of float
          significant wave height.
-    tp : ndarray
+    tp : ndarray of float
          peack period.
     tm : float
          mean period.(default 0.0)
-    direction : ndarray
+    direction : ndarray of float
          dominant wave direction.
     meanDirection : float
          mean wave direction.(default 0.0)

simapy/metocean/hindcast/stochasticwind.py

@@ -16,9 +16,9 @@ class StochasticWind(NamedEntity):
          (default "")
     name : str
          name for the metocean data.(default None)
-    speed : ndarray
+    speed : ndarray of float
          mean wind speed.
-    direction : ndarray
+    direction : ndarray of float
          wind direction.
     level : float
          at this level, upward positive.(default 0.0)

simapy/metocean/longTermStatistics/blueprints/hsbinned.py

@@ -16,4 +16,4 @@ class HsBinnedBlueprint(NamedEntityBlueprint):
         self.add_attribute(Attribute("name","string","unique name for this bin."))
         self.add_attribute(Attribute("upperHsLimit","number","mean sector direction.",default=0.0))
         self.add_attribute(Attribute("lowerHsLimit","number","mean sector direction.",default=0.0))
-        self.add_attribute(BlueprintAttribute("weibullDistribution","metocean/longTermStatistics/Weibull","Weibull parameters.",True))
+        self.add_attribute(BlueprintAttribute("weibullDistribution","/longTermStatistics/Weibull","Weibull parameters.",True))

simapy/metocean/longTermStatistics/blueprints/hsbinnedsector.py

@@ -17,4 +17,4 @@ class HsBinnedSectorBlueprint(NamedEntityBlueprint):
         self.add_attribute(Attribute("direction","number","mean sector direction.",default=0.0))
         self.add_attribute(Attribute("sectorSize","number","sector size.",default=0.0))
         self.add_attribute(Attribute("probability","number","probability of this combination",default=0.0))
-        self.add_attribute(BlueprintAttribute("bins","metocean/longTermStatistics/HsBinned","different Hs bins.",True,Dimension("*")))
+        self.add_attribute(BlueprintAttribute("bins","/longTermStatistics/HsBinned","different Hs bins.",True,Dimension("*")))

simapy/metocean/longTermStatistics/blueprints/longtermstats.py

@@ -14,4 +14,4 @@ class LongTermStatsBlueprint(NamedEntityBlueprint):
         super().__init__(name,package_path,description)
         self.add_attribute(Attribute("description","string","",default=""))
         self.add_attribute(Attribute("name","string","name for the metocean data."))
-        self.add_attribute(BlueprintAttribute("periods","metocean/longTermStatistics/Period","statistical model for different time periods.",True,Dimension("*")))
+        self.add_attribute(BlueprintAttribute("periods","/longTermStatistics/Period","statistical model for different time periods.",True,Dimension("*")))

simapy/metocean/longTermStatistics/blueprints/period.py

@@ -15,6 +15,6 @@ class PeriodBlueprint(NamedEntityBlueprint):
         self.add_attribute(Attribute("description","string","",default=""))
         self.add_attribute(Attribute("name","string","name of the time period as seen in SIMA."))
         self.add_attribute(Attribute("period","string","place holder identification for the time period e.g. Year, Jan"))
-        self.add_attribute(BlueprintAttribute("wave","metocean/longTermStatistics/wave/Stat","models for statistical representation of wave, e.g. omni, or 12sec.",True,Dimension("*")))
-        self.add_attribute(BlueprintAttribute("wind","metocean/longTermStatistics/level/Stat","models for statistical representation of wind, e.g. omni, or 12sec.",True,Dimension("*")))
-        self.add_attribute(BlueprintAttribute("current","metocean/longTermStatistics/level/Stat","models for statistical representation of current, e.g. omni, or 12sec.",True,Dimension("*")))
+        self.add_attribute(BlueprintAttribute("wave","/longTermStatistics/wave/Stat","models for statistical representation of wave, e.g. omni, or 12sec.",True,Dimension("*")))
+        self.add_attribute(BlueprintAttribute("wind","/longTermStatistics/level/Stat","models for statistical representation of wind, e.g. omni, or 12sec.",True,Dimension("*")))
+        self.add_attribute(BlueprintAttribute("current","/longTermStatistics/level/Stat","models for statistical representation of current, e.g. omni, or 12sec.",True,Dimension("*")))

simapy/metocean/longTermStatistics/blueprints/sector.py

@@ -17,5 +17,5 @@ class SectorBlueprint(NamedEntityBlueprint):
         self.add_attribute(Attribute("direction","number","mean sector direction.",default=0.0))
         self.add_attribute(Attribute("sectorSize","number","sector size.",default=0.0))
         self.add_attribute(Attribute("probability","number","probability of this combination",default=0.0))
-        self.add_attribute(BlueprintAttribute("weibullDistribution","metocean/longTermStatistics/Weibull","Weibull parameters.",True))
-        self.add_attribute(BlueprintAttribute("extremeValues","metocean/longTermStatistics/ExtremeValues","extreme values.",True))
+        self.add_attribute(BlueprintAttribute("weibullDistribution","/longTermStatistics/Weibull","Weibull parameters.",True))
+        self.add_attribute(BlueprintAttribute("extremeValues","/longTermStatistics/ExtremeValues","extreme values.",True))

simapy/metocean/longTermStatistics/extremevalues.py

@@ -16,9 +16,9 @@ class ExtremeValues(Entity):
          (default "")
     variable : str
          variable.(default None)
-    returnPeriods : ndarray
+    returnPeriods : ndarray of float
          return periods
-    extremes : ndarray
+    extremes : ndarray of float
          extreme values for the variable
     """
 

simapy/metocean/longTermStatistics/level/blueprints/profile.py

@@ -15,7 +15,7 @@ class ProfileBlueprint(NamedEntityBlueprint):
         self.add_attribute(Attribute("description","string","",default=""))
         self.add_attribute(Attribute("name","string","name for statistics at this level, e.g. level10m."))
         self.add_attribute(Attribute("level","number","sampling rate in hours.",default=0.0))
-        self.add_attribute(BlueprintAttribute("sectors","metocean/longTermStatistics/Sector","sectoral representation of wind/current at this sampling rate.",True,Dimension("*")))
-        self.add_attribute(BlueprintAttribute("omni","metocean/longTermStatistics/Sector","omni representation of wind/current at this sampling rate.",True))
-        self.add_attribute(BlueprintAttribute("sectoralHsBinned","metocean/longTermStatistics/HsBinnedSector","sectoral representation of wind/current binned for different Hs at this sampling rate.",True,Dimension("*")))
-        self.add_attribute(BlueprintAttribute("omniHsBinned","metocean/longTermStatistics/HsBinnedSector","omni representation of wind/current binned for different Hs at this sampling rate.",True))
+        self.add_attribute(BlueprintAttribute("sectors","/longTermStatistics/Sector","sectoral representation of wind/current at this sampling rate.",True,Dimension("*")))
+        self.add_attribute(BlueprintAttribute("omni","/longTermStatistics/Sector","omni representation of wind/current at this sampling rate.",True))
+        self.add_attribute(BlueprintAttribute("sectoralHsBinned","/longTermStatistics/HsBinnedSector","sectoral representation of wind/current binned for different Hs at this sampling rate.",True,Dimension("*")))
+        self.add_attribute(BlueprintAttribute("omniHsBinned","/longTermStatistics/HsBinnedSector","omni representation of wind/current binned for different Hs at this sampling rate.",True))

simapy/metocean/longTermStatistics/level/blueprints/stat.py

@@ -15,4 +15,4 @@ class StatBlueprint(NamedEntityBlueprint):
         self.add_attribute(Attribute("description","string","",default=""))
         self.add_attribute(Attribute("name","string","name for this statistical data, wind/current, which appear in SIMA, e.g. wind_12sec, or current_omni."))
         self.add_attribute(Attribute("duration","number","event duration in hours.",default=0.0))
-        self.add_attribute(BlueprintAttribute("levels","metocean/longTermStatistics/level/Profile","statistical representation of wind/current at this level and sampling rate.",True,Dimension("*")))
+        self.add_attribute(BlueprintAttribute("levels","/longTermStatistics/level/Profile","statistical representation of wind/current at this level and sampling rate.",True,Dimension("*")))

simapy/metocean/longTermStatistics/level/sectors.py

@@ -14,11 +14,11 @@ class Sectors(Entity):
     -----------------
     description : str
          (default "")
-    direction : ndarray
+    direction : ndarray of float
          sector direction.
-    sectorSize : ndarray
+    sectorSize : ndarray of float
          sector size.
-    probability : ndarray
+    probability : ndarray of float
          probability of this combination
     """
 

simapy/metocean/longTermStatistics/level/weibull.py

@@ -18,11 +18,11 @@ class Weibull(Entity):
          variable.(default None)
     unit : str
          unit.(default None)
-    shape : ndarray
+    shape : ndarray of float
          shape.
-    scale : ndarray
+    scale : ndarray of float
          scale.
-    location : ndarray
+    location : ndarray of float
          location.
     """
 

simapy/metocean/longTermStatistics/wave/blueprints/sector.py

@@ -17,7 +17,7 @@ class SectorBlueprint(NamedEntityBlueprint):
         self.add_attribute(Attribute("direction","number","mean sector direction.",default=0.0))
         self.add_attribute(Attribute("sectorSize","number","sector size.",default=0.0))
         self.add_attribute(Attribute("probability","number","probability of this combination",default=0.0))
-        self.add_attribute(BlueprintAttribute("weibullDistribution","metocean/longTermStatistics/wave/Weibull","weibull parameters for Hs.",True))
-        self.add_attribute(BlueprintAttribute("extremeValues","metocean/longTermStatistics/wave/JointExtremeValues","joined extreme values for Hs and Tp.",True))
-        self.add_attribute(BlueprintAttribute("spectralPeak","metocean/longTermStatistics/wave/SpectralPeak","Spectral peak period as a function of Hs.",True))
-        self.add_attribute(BlueprintAttribute("contours","metocean/longTermStatistics/wave/Contour","Hs-Tp contours",True,Dimension("*")))
+        self.add_attribute(BlueprintAttribute("weibullDistribution","/longTermStatistics/wave/Weibull","weibull parameters for Hs.",True))
+        self.add_attribute(BlueprintAttribute("extremeValues","/longTermStatistics/wave/JointExtremeValues","joined extreme values for Hs and Tp.",True))
+        self.add_attribute(BlueprintAttribute("spectralPeak","/longTermStatistics/wave/SpectralPeak","Spectral peak period as a function of Hs.",True))
+        self.add_attribute(BlueprintAttribute("contours","/longTermStatistics/wave/Contour","Hs-Tp contours",True,Dimension("*")))

simapy/metocean/longTermStatistics/wave/blueprints/stat.py

@@ -15,5 +15,5 @@ class StatBlueprint(NamedEntityBlueprint):
         self.add_attribute(Attribute("description","string","",default=""))
         self.add_attribute(Attribute("name","string","name for this statistical data which appear in SIMA, e.g. wave12sec, or waveomni."))
         self.add_attribute(Attribute("duration","number","sampling rate in hours.",default=0.0))
-        self.add_attribute(BlueprintAttribute("sectors","metocean/longTermStatistics/wave/Sector","sectoral wave at this sampling rate for Hs.",True,Dimension("*")))
-        self.add_attribute(BlueprintAttribute("omni","metocean/longTermStatistics/wave/Sector","omni wave at this sampling rate for Hs.",True))
+        self.add_attribute(BlueprintAttribute("sectors","/longTermStatistics/wave/Sector","sectoral wave at this sampling rate for Hs.",True,Dimension("*")))
+        self.add_attribute(BlueprintAttribute("omni","/longTermStatistics/wave/Sector","omni wave at this sampling rate for Hs.",True))

simapy/metocean/longTermStatistics/wave/contour.py

@@ -14,9 +14,9 @@ class Contour(Entity):
     -----------------
     description : str
          (default "")
-    Hs : ndarray
+    Hs : ndarray of float
          Hs.
-    Tp : ndarray
+    Tp : ndarray of float
          Tp
     returnPeriod : float
          return period(default 0.0)

simapy/metocean/longTermStatistics/wave/jointextremevalues.py

@@ -18,11 +18,11 @@ class JointExtremeValues(Entity):
          first variable.(default None)
     var2 : str
          second variable.(default None)
-    returnPeriods : ndarray
+    returnPeriods : ndarray of float
          return periods
-    var1Extremes : ndarray
+    var1Extremes : ndarray of float
          extreme values for the variable 1
-    var2Extremes : ndarray
+    var2Extremes : ndarray of float
          extreme values for the variable 2
     """
 

simapy/metocean/longTermStatistics/wave/spectralpeak.py

@@ -14,13 +14,13 @@ class SpectralPeak(Entity):
     -----------------
     description : str
          (default "")
-    Hs : ndarray
+    Hs : ndarray of float
          Hs.
-    int5 : ndarray
+    int5 : ndarray of float
          5%-interval
-    mean : ndarray
+    mean : ndarray of float
          mean.
-    int95 : ndarray
+    int95 : ndarray of float
          95 %-interval
     """
 

simapy/metocean/package_info.py

@@ -1 +1,3 @@
-packages =  [{'name': 'hindcast', 'version': 1}, {'name': 'longTermStatistics', 'version': 1, 'packages': [{'name': 'level', 'version': 1}, {'name': 'wave', 'version': 1}]}, {'name': 'scatter', 'version': 1}]
+
+version = "1.0.0"
+packages =  {'hindcast': 1, 'longTermStatistics': 1, 'scatter': 1}

simapy/metocean/scatter/blueprints/scatter.py

@@ -18,5 +18,5 @@ class ScatterBlueprint(NamedEntityBlueprint):
         self.add_attribute(Attribute("tpUpperLimits","number","upper limits of the boundaries for each column in the scatter data.",Dimension("*"),default=0.0))
         self.add_attribute(Attribute("seaStateDuration","number","duration of sea state.",default=0.0))
         self.add_attribute(Attribute("countingPeriod","number","the duration which is used to count the occurrence of events.",default=0.0))
-        self.add_attribute(BlueprintAttribute("sectors","metocean/scatter/Sector","sector scatter data.",True,Dimension("*")))
-        self.add_attribute(BlueprintAttribute("omni","metocean/scatter/Sector","omni scatter data.",True))
+        self.add_attribute(BlueprintAttribute("sectors","/scatter/Sector","sector scatter data.",True,Dimension("*")))
+        self.add_attribute(BlueprintAttribute("omni","/scatter/Sector","omni scatter data.",True))

simapy/metocean/scatter/blueprints/sector.py

@@ -16,6 +16,6 @@ class SectorBlueprint(NamedEntityBlueprint):
         self.add_attribute(Attribute("name","string","unique name for the sector, e.g. sec120, or omni."))
         self.add_attribute(Attribute("direction","number","sector direction.",default=0.0))
         self.add_attribute(Attribute("sectorSize","number","sector size.",default=0.0))
-        self.add_attribute(BlueprintAttribute("wave","metocean/scatter/Wave","the scatter data for wave.",True))
-        self.add_attribute(BlueprintAttribute("wind","metocean/scatter/WindCurrent","the scatter data for wind at different levels.",True,Dimension("*")))
-        self.add_attribute(BlueprintAttribute("current","metocean/scatter/WindCurrent","the scatter data for current at different levels.",True,Dimension("*")))
+        self.add_attribute(BlueprintAttribute("wave","/scatter/Wave","the scatter data for wave.",True))
+        self.add_attribute(BlueprintAttribute("wind","/scatter/WindCurrent","the scatter data for wind at different levels.",True,Dimension("*")))
+        self.add_attribute(BlueprintAttribute("current","/scatter/WindCurrent","the scatter data for current at different levels.",True,Dimension("*")))

simapy/metocean/scatter/scatter.py

@@ -17,9 +17,9 @@ class Scatter(NamedEntity):
          (default "")
     name : str
          name for the scatter data as appear in SIMA.(default None)
-    hsUpperLimits : ndarray
+    hsUpperLimits : ndarray of float
          upper limits of the boundaries for each row in the scatter data.
-    tpUpperLimits : ndarray
+    tpUpperLimits : ndarray of float
          upper limits of the boundaries for each column in the scatter data.
     seaStateDuration : float
          duration of sea state.(default 0.0)

simapy/metocean/scatter/wave.py

@@ -14,7 +14,7 @@ class Wave(Entity):
     -----------------
     description : str
          (default "")
-    occurrence : ndarray
+    occurrence : ndarray of int
          the scatter data for occurrence of Hs-Tp.
     """
 

simapy/metocean/scatter/windcurrent.py

@@ -16,9 +16,9 @@ class WindCurrent(Entity):
          (default "")
     level : float
          measured level.(default 0.0)
-    direction : ndarray
+    direction : ndarray of float
          the scatter data for direction.
-    speed : ndarray
+    speed : ndarray of float
          the scatter data for speed.
     """
 

simapy/sima/command/blueprints/importcommand.py

@@ -17,4 +17,4 @@ class ImportCommandBlueprint(CommandBlueprint):
         self.add_attribute(Attribute("name","string",""))
         self.add_attribute(BlueprintAttribute("parameters","sima/sima/Property","Additional parameters",True,Dimension("*")))
         self.add_attribute(Attribute("file","string","Path to file, e.g stask",optional=False))
-        self.add_attribute(Attribute("configuration","string","Path to configuration file (context specific)",optional=False))
+        self.add_attribute(Attribute("configuration","string","Optional path to configuration file (context specific)"))

simapy/sima/command/importcommand.py

@@ -23,7 +23,7 @@ class ImportCommand(Command):
     file : str
          Path to file, e.g stask(default None)
     configuration : str
-         Path to configuration file (context specific)(default None)
+         Optional path to configuration file (context specific)(default None)
     """
 
     def __init__(self , description="", **kwargs):
@@ -101,7 +101,7 @@ class ImportCommand(Command):
 
     @property
     def configuration(self) -> str:
-        """Path to configuration file (context specific)"""
+        """Optional path to configuration file (context specific)"""
         return self.__configuration
 
     @configuration.setter

simapy/sima/environment/__init__.py

@@ -35,7 +35,6 @@ from .sletringen import Sletringen # noqa
 from .stationaryuniform import StationaryUniform # noqa
 from .turbsimfluctuatingthreecomponent import TurbSimFluctuatingThreeComponent # noqa
 from .wave import Wave # noqa
-from .wavefromfile import WaveFromFile # noqa
 from .wills import Wills # noqa
 from .wind import Wind # noqa
 from .windfromfile import WindFromFile # noqa

simapy/sima/environment/blueprints/fluctuatingthreecomponent.py

@@ -20,9 +20,9 @@ class FluctuatingThreeComponentBlueprint(WindBlueprint):
         self.add_attribute(Attribute("longitudinalFileName","string","Path and filename for the fluctuating longitudinal wind time series"))
         self.add_attribute(Attribute("lateralFileName","string","Path and filename for the fluctuating lateral wind time series"))
         self.add_attribute(Attribute("verticalFileName","string","Path and filename for the fluctuating vertical wind time series"))
-        self.add_attribute(Attribute("lowerLeftX","number","X-coordinate of the upwind lower left data point, in wind aligned coordinates",default=0.0))
-        self.add_attribute(Attribute("lowerLeftY","number","Y-coordinate of the upwind lower left data point, in wind aligned coordinates",default=0.0))
-        self.add_attribute(Attribute("lowerLeftZ","number","Z-coordinate of the upwind lower left data point, in wind aligned coordinates",default=0.0))
+        self.add_attribute(Attribute("lowerLeftX","number","X-coordinate of the front lower left data point, in wind aligned coordinates",default=0.0))
+        self.add_attribute(Attribute("lowerLeftY","number","Y-coordinate of the front lower left data point, in wind aligned coordinates",default=0.0))
+        self.add_attribute(Attribute("lowerLeftZ","number","Z-coordinate of the front lower left data point, in wind aligned coordinates",default=0.0))
         self.add_attribute(Attribute("numPointsX","integer","Number of grid points in X- (longitudinal) direction",default=0))
         self.add_attribute(Attribute("numPointsY","integer","Number of grid points in Y- (lateral) direction",default=0))
         self.add_attribute(Attribute("numPointsZ","integer","Number of grid points in Z- (vertical) direction",default=0))

simapy/sima/environment/fluctuatingthreecomponent.py

@@ -28,11 +28,11 @@ class FluctuatingThreeComponent(Wind):
     verticalFileName : str
          Path and filename for the fluctuating vertical wind time series(default None)
     lowerLeftX : float
-         X-coordinate of the upwind lower left data point, in wind aligned coordinates(default 0.0)
+         X-coordinate of the front lower left data point, in wind aligned coordinates(default 0.0)
     lowerLeftY : float
-         Y-coordinate of the upwind lower left data point, in wind aligned coordinates(default 0.0)
+         Y-coordinate of the front lower left data point, in wind aligned coordinates(default 0.0)
     lowerLeftZ : float
-         Z-coordinate of the upwind lower left data point, in wind aligned coordinates(default 0.0)
+         Z-coordinate of the front lower left data point, in wind aligned coordinates(default 0.0)
     numPointsX : int
          Number of grid points in X- (longitudinal) direction(default 0)
     numPointsY : int
@@ -169,7 +169,7 @@ class FluctuatingThreeComponent(Wind):
 
     @property
     def lowerLeftX(self) -> float:
-        """X-coordinate of the upwind lower left data point, in wind aligned coordinates"""
+        """X-coordinate of the front lower left data point, in wind aligned coordinates"""
         return self.__lowerLeftX
 
     @lowerLeftX.setter
@@ -179,7 +179,7 @@ class FluctuatingThreeComponent(Wind):
 
     @property
     def lowerLeftY(self) -> float:
-        """Y-coordinate of the upwind lower left data point, in wind aligned coordinates"""
+        """Y-coordinate of the front lower left data point, in wind aligned coordinates"""
         return self.__lowerLeftY
 
     @lowerLeftY.setter
@@ -189,7 +189,7 @@ class FluctuatingThreeComponent(Wind):
 
     @property
     def lowerLeftZ(self) -> float:
-        """Z-coordinate of the upwind lower left data point, in wind aligned coordinates"""
+        """Z-coordinate of the front lower left data point, in wind aligned coordinates"""
         return self.__lowerLeftZ
 
     @lowerLeftZ.setter

simapy/sima/hla/blueprints/hlalocation.py

@@ -5,9 +5,9 @@ from dmt.dimension import Dimension
 from dmt.attribute import Attribute
 from dmt.enum_attribute import EnumAttribute
 from dmt.blueprint_attribute import BlueprintAttribute
-from ...sima.blueprints.location import LocationBlueprint
+from ...sima.blueprints.namedobject import NamedObjectBlueprint
 
-class HLALocationBlueprint(LocationBlueprint):
+class HLALocationBlueprint(NamedObjectBlueprint):
     """"""
 
     def __init__(self, name="HLALocation", package_path="sima/hla", description=""):
@@ -16,12 +16,8 @@ class HLALocationBlueprint(LocationBlueprint):
         self.add_attribute(BlueprintAttribute("scriptableValues","sima/sima/ScriptableValue","",True,Dimension("*")))
         self.add_attribute(Attribute("name","string",""))
         self.add_attribute(BlueprintAttribute("initialViewpoint","sima/sima/InitialViewpoint","",True))
-        self.add_attribute(BlueprintAttribute("initialRotationpoint","sima/sima/Point3","",True))
         self.add_attribute(BlueprintAttribute("viewpoints","sima/sima/NamedViewpoint","",True,Dimension("*")))
-        self.add_attribute(Attribute("relativeCompassAngle","number","Relative angle between analysis x-axis and north direction in anti-clockwise direction",default=0.0))
-        self.add_attribute(Attribute("utmX","number","Offset of local coordinate system origin (X) relative to UTM (Easting).",default=0.0))
-        self.add_attribute(Attribute("utmY","number","Offset of local coordinate system origin (Y) relative to UTM (Northing).",default=0.0))
-        self.add_attribute(Attribute("gridZone","string","Zone consists of a number from [01-60] and a letter from [C-Z], or just one of [A,B,Y,Z] if on the antarctic or arctic pole."))
+        self.add_attribute(Attribute("relativeCompassAngle","number","This is the relative angle measured from the global x-axis to the compass North, measured counter-clockwise",default=0.0))
         self.add_attribute(BlueprintAttribute("infrastructureBodies","sima/sima/InfrastructureBody","",True,Dimension("*")))
         self.add_attribute(BlueprintAttribute("seaSurface","sima/hla/HLASeaSurface","",True))
         self.add_attribute(BlueprintAttribute("flatBottom","sima/sima/FlatBottom","",True))