Combine methods to calcualte sati and satw

.clang-format

@@ -0,0 +1,50 @@
+BasedOnStyle: LLVM
+Language: C
+
+# Core Formatting
+ColumnLimit: 100
+TabWidth: 4
+IndentWidth: 4
+UseTab: Never
+MaxEmptyLinesToKeep: 1
+
+# Line Wrapping & Breaking
+ReflowComments: true # Wraps long comment lines to fit ColumnLimit
+BreakBeforeBraces: Attach # Keeps opening braces on the same line as statements
+BreakBeforeBinaryOperators: All # Wraps lines BEFORE operators (e.g., +, &&)
+AlignAfterOpenBracket: BlockIndent # Aligns wrapped arguments to a new indented block
+
+# Parameter & Argument Layout
+BinPackArguments: false # Forces one argument per line if they wrap
+BinPackParameters: false # Forces one parameter per line if they wrap
+AllowAllParametersOfDeclarationOnNextLine: true
+AllowAllArgumentsOnNextLine: true
+
+# Alignment Rules
+IndentCaseLabels: true # Indents 'case' statements inside a 'switch'
+AlignEscapedNewlines: Left # Aligns backslashes in multi-line macros to the left
+
+AlignConsecutiveMacros: # Aligns macro definitions horizontally
+    Enabled: true
+    AcrossEmptyLines: true
+    AcrossComments: false
+
+AlignConsecutiveAssignments: # Aligns '=' operators on consecutive lines
+    Enabled: true
+    AcrossEmptyLines: false
+    AcrossComments: true
+
+# Code Style & Readability
+PointerAlignment: Right # Places asterisk next to name: 'int *ptr'
+SortIncludes: CaseSensitive # Automatically sorts #include headers alphabetically
+
+# Whitespace Padding
+SpaceBeforeParens: Custom # Required to unlock fine-grained spacing rules
+SpaceBeforeParensOptions: # Replaces the deprecated SpaceBeforeFunctionDeclarationParens flag
+    AfterFunctionDeclarationName: false # Enforces 'void func()' instead of 'void func ()'
+    AfterFunctionDefinitionName: false # Enforces 'void func() {}' instead of 'void func () {}'
+    AfterControlStatements: true # Enforces 'if (x)' instead of 'if(x)'
+SpacesInParens: Custom # Replaces deprecated 'SpaceInEmptyParentheses'
+SpacesInParensOptions:
+    InEmptyParentheses: false # Disallows spaces like 'void func( )
+SpacesInContainerLiterals: true # Adds spacing inside initializers: '{ 1, 2 }'

Makefile

@@ -60,10 +60,10 @@ isort: ## using isort to sort imports
 lint:
 	flake8 smrf
 
-tests:
+tests: build_extensions
 	python3 -m unittest discover -s smrf/tests/
 
-tests_fast_fail:
+tests_fast_fail: build_extensions
 	python3 -m unittest discover -s smrf/tests/ -f
 
 coverage: ## run coverage and submit
@@ -97,5 +97,8 @@ dist: clean
 	python setup.py bdist_wheel
 	ls -l dist
 
-install: clean
-	python3 -m pip install -e .[dev]
+install: clean build_extensions
+	python3 -m pip install .[dev]
+
+install-dev: clean
+	python3 -m pip install --no-deps -e .[dev]

setup.py

@@ -3,89 +3,82 @@
 import os
 
 import numpy
-from setuptools import Extension, setup
-from Cython.Distutils import build_ext
 from Cython.Build import cythonize
+from Cython.Distutils import build_ext
+from setuptools import Extension, setup
 
 # Give user option to specify local compiler name
 if "CC" not in os.environ:
     os.environ["CC"] = "gcc"
 
 print("Compiler set to: " + os.environ["CC"])
 
-extension_params = dict(
-    extra_compile_args=[
-        '-fopenmp',
-        '-O3',
+extension_params = {
+    "extra_compile_args": [
+        "-fopenmp",
+        "-O3",
     ],
-    extra_link_args=['-fopenmp'],
-    include_dirs=[numpy.get_include()]
-)
+    "extra_link_args": ["-fopenmp"],
+    "include_dirs": [numpy.get_include()],
+    "define_macros": [("NPY_NO_DEPRECATED_API", "NPY_1_7_API_VERSION")],
+}
 
 directives = {
-    'language_level': "3str",
-    'embedsignature': True,
-    'boundscheck': False,
-    'wraparound': False,
-    'initializedcheck': False,
-    'cdivision': True,
-    'binding': True,
+    "language_level": "3str",
+    "embedsignature": True,
+    "boundscheck": False,
+    "wraparound": False,
+    "initializedcheck": False,
+    "cdivision": True,
+    "binding": True,
 }
 
 extensions = []
 
 # detrended kriging
 extensions += [
     Extension(
-        'smrf.spatial.dk.detrended_kriging',
+        "smrf.spatial.dk.detrended_kriging",
         sources=[
-            os.path.join('smrf/spatial/dk', source_file) for source_file in [
+            os.path.join("smrf/spatial/dk", source_file)
+            for source_file in [
                 "detrended_kriging.pyx",
                 "krige.c",
                 "lusolv.c",
-                "array.c"
+                "array.c",
             ]
         ],
-        **extension_params
+        **extension_params,
     ),
 ]
 
 # envphys core c functions
 extensions += [
     Extension(
-        'smrf.envphys.core.envphys_c',
+        "smrf.envphys.core.envphys_c",
         sources=[
-            os.path.join('smrf/envphys/core', val) for val in [
-                "envphys_c.pyx",
-                "topotherm.c",
-                "dewpt.c",
-                "iwbt.c"
-            ]
+            os.path.join("smrf/envphys/core", val)
+            for val in ["envphys_c.pyx", "topotherm.c", "dewpt.c", "iwbt.c"]
         ],
-        **extension_params
+        **extension_params,
     ),
     Extension(
-        'smrf.envphys.solar.toposplit',
-        sources=['smrf/envphys/solar/toposplit.pyx'],
-        **extension_params
+        "smrf.envphys.solar.toposplit",
+        sources=["smrf/envphys/solar/toposplit.pyx"],
+        **extension_params,
     ),
     Extension(
-        'smrf.utils.wind.wind_c',
+        "smrf.utils.wind.wind_c",
         sources=[
-            os.path.join('smrf/utils/wind', val) for val in [
-                "wind_c.pyx",
-                "breshen.c",
-                "calc_wind.c"
-            ]
+            os.path.join("smrf/utils/wind", val)
+            for val in ["wind_c.pyx", "breshen.c", "calc_wind.c"]
         ],
-        **extension_params
+        **extension_params,
     ),
 ]
 
 setup(
-    cmdclass={
-        'build_ext': build_ext
-    },
+    cmdclass={"build_ext": build_ext},
     ext_modules=cythonize(
         extensions,
         compiler_directives=directives,

smrf/data/input/wrf.py

@@ -5,7 +5,7 @@
 
 from smrf.data.input.gridded_input import GriddedInput
 from smrf.data.input.netcdf import metadata_name_from_index
-from smrf.envphys.vapor_pressure import satvp
+from smrf.envphys.vapor_pressure import svp_for_celsius
 from smrf.utils.utils import apply_utm
 
 
@@ -143,9 +143,8 @@ def load(self):
         self.air_temp = self.air_temp - 273.15
 
         self._logger.debug('Calculating vapor_pressure')
-        vp = satvp(self.dew_point.values)
-        self.vapor_pressure = pd.DataFrame(
-            vp, index=time, columns=self.primary_id)
+        vp = svp_for_celsius(self.dew_point.values)
+        self.vapor_pressure = pd.DataFrame(vp, index=time, columns=self.primary_id)
 
         self._logger.debug('Loading cloud_factor')
         self.cloud_factor = pd.DataFrame(index=time, columns=self.primary_id)

smrf/distribute/vapor_pressure.py

@@ -1,10 +1,10 @@
-
 import numpy as np
 
-from .variable_base import VariableBase
 from smrf.envphys.core import envphys_c
 from smrf.utils import utils
 
+from .variable_base import VariableBase
+
 
 class VaporPressure(VariableBase):
     """
@@ -13,8 +13,8 @@ class VaporPressure(VariableBase):
     :mod:`smrf.envphys.vapor_pressure.rh2vp`. The vapor pressure is distributed
     instead of the relative humidity as it is an absolute measurement of the
     vapor within the atmosphere and will follow elevational trends (typically
-    negative).  Were as relative humidity is a relative measurement which
-    varies in complex ways over the topography.  From the distributed vapor
+    negative). Wereas relative humidity is a relative measurement which
+    varies in complex ways over the topography. From the distributed vapor
     pressure, the dew point is calculated for use by other distribution
     methods. The dew point temperature is further corrected to ensure that it
     does not exceed the distributed air temperature.
@@ -49,7 +49,7 @@ def __init__(self, config, topo):
     def distribute(self, data, ta):
         """
         Distribute air temperature given a Panda's dataframe for a single time
-        step. Calls :mod:`smrf.distribute.ImageData._distribute`.
+        step. Calls :mod:`smrf.distribute.VariableBase._distribute`.
 
         The following steps are performed when distributing vapor pressure:
 
@@ -65,18 +65,16 @@ def distribute(self, data, ta):
 
         """
 
-        self._logger.debug('%s -- Distributing vapor_pressure' % data.name)
+        self._logger.debug("%s -- Distributing vapor_pressure" % data.name)
 
         # calculate the vapor pressure
         self._distribute(data)
 
         # set the limits
-        self.vapor_pressure = utils.set_min_max(self.vapor_pressure,
-                                                self.min,
-                                                self.max)
+        self.vapor_pressure = utils.set_min_max(self.vapor_pressure, self.min, self.max)
 
         # calculate the dew point
-        self._logger.debug('%s -- Calculating dew point' % data.name)
+        self._logger.debug("%s -- Calculating dew point" % data.name)
 
         # use the core_c to calculate the dew point
         dew_point_temperature = np.zeros_like(self.vapor_pressure, dtype=np.float64)
@@ -89,13 +87,13 @@ def distribute(self, data, ta):
 
         ind = dew_point_temperature >= ta
 
-        if (np.sum(ind) > 0):
+        if np.sum(ind) > 0:
             dew_point_temperature[ind] = ta[ind] - 0.2
 
         self.dew_point = dew_point_temperature
 
         # calculate wet bulb temperature
-        if self.precip_temp_method == 'wet_bulb':
+        if self.precip_temp_method == "wet_bulb":
             # initialize timestep wet_bulb
             wet_bulb = np.zeros_like(self.vapor_pressure, dtype=np.float64)
             # calculate wet_bulb