Fixed TPXO environment variables issue in #118

schism-dev · Feb 3, 2024 · 5d453fc · 5d453fc
1 parent 445ea19
commit 5d453fc
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/examples/Bctides/gen_bctides.py b/examples/Bctides/gen_bctides.py
@@ -10,6 +10,10 @@
 from pyschism.mesh import Hgrid
 from pyschism.forcing.bctides import Bctides
 
+##Optional: set up environment variable for TPXO files
+#os.environ['TPXO_ELEVATION'] = '/path-to-your-hfile/h_tpxo9.v1.nc'
+#os.environ['TPXO_VELOCITY'] = '/path-to-your-ufile/u_tpxo9.v1.nc'
+
 logging.basicConfig(
     format = "[%(asctime)s] %(name)s %(levelname)s: %(message)s",
     force=True,

diff --git a/pyschism/forcing/bctides/tpxo.py b/pyschism/forcing/bctides/tpxo.py
@@ -101,8 +101,11 @@ def h(self):
                 if self._h_file is None:
                     self._h_file = pathlib.Path(
                         appdirs.user_data_dir('tpxo')) / TPXO_ELEVATION
+                elif type(self._h_file) is str:
+                    self._h_file = pathlib.Path(self._h_file)
             if not self._h_file.exists():
                 raise_missing_file(self._h_file, TPXO_ELEVATION)
+            logger.info(f'h_file is {self._h_file}')
             self._h = Dataset(self._h_file)
         return self._h
 
@@ -114,8 +117,11 @@ def uv(self):
                 if self._u_file is None:
                     self._u_file = pathlib.Path(
                         appdirs.user_data_dir('tpxo')) / TPXO_VELOCITY
+                elif type(self._u_file) is str:
+                    self._u_file = pathlib.Path(self._u_file)
             if not self._u_file.exists():
                 raise_missing_file(self._u_file, TPXO_VELOCITY)
+            logger.info(f'u_file is {self._u_file}')
             self._uv = Dataset(self._u_file)
         return self._uv