Skip to content

Commit

Permalink
minor printout changes
Browse files Browse the repository at this point in the history
  • Loading branch information
leewujung committed Feb 21, 2020
1 parent 5c16362 commit b77ef6d
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 4 deletions.
3 changes: 2 additions & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,8 @@ Contributors
`Kavin Nguyen <https://github.com/ngkavin>`_ (@ngkavin)
are primary developers of this project.
`Valentina Staneva <https://escience.washington.edu/people/valentina-staneva/>`_ (@valentina-s)
provides consultation and also contributes to development. Other contributors are listed `here <echopype documentation>`_.
provides consultation and also contributes to development.
Other contributors are listed `here <echopype documentation>`_.

We thank Dave Billenness of ASL Environmental Sciences for
providing the AZFP Matlab Toolbox as reference for our
Expand Down
2 changes: 1 addition & 1 deletion echopype/convert/ek60.py
Original file line number Diff line number Diff line change
Expand Up @@ -462,7 +462,7 @@ def copyfiles():

# Check if nc file already exists and deletes it if overwrite is true
if os.path.exists(out_file) and overwrite:
print(" overwriting: " + out_file)
print(" overwriting: " + out_file) # TODO: this should be printed after 'converting...'
os.remove(out_file)
# Check if nc file already exists
# ... if yes, abort conversion and issue warning
Expand Down
2 changes: 2 additions & 0 deletions echopype/model/azfp.py
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,8 @@ def calibrate(self, save=False, save_postfix='_Sv', save_path=None):
save_path : str
Full filename to save to, overwriting the RAWFILE_Sv.nc default
"""
# Print raw data nc file
print('%s calibrating data in %s' % (dt.datetime.now().strftime('%H:%M:%S'), self.file_path))

# Open data set for Environment and Beam groups
ds_beam = xr.open_dataset(self.file_path, group="Beam")
Expand Down
3 changes: 3 additions & 0 deletions echopype/model/ek60.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,9 @@ def calibrate(self, save=False, save_postfix='_Sv', save_path=None):
save_path : str
Full filename to save to, overwriting the RAWFILENAME_Sv.nc default
"""
# Print raw data nc file
print('%s calibrating data in %s' % (dt.datetime.now().strftime('%H:%M:%S'), self.file_path))

# Open data set for Environment and Beam groups
ds_beam = xr.open_dataset(self.file_path, group="Beam")

Expand Down
5 changes: 4 additions & 1 deletion echopype/model/modelbase.py
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,9 @@ def _assemble_path():
file_out = _assemble_path()

# Create folder if not already exists
if save_dir == '':
# TODO: should we use '.' instead of os.getcwd()?
save_dir = os.getcwd() # explicit about path to current directory
if not os.path.exists(save_dir):
os.mkdir(save_dir)

Expand Down Expand Up @@ -557,7 +560,7 @@ def get_MVBS(self, source_postfix='_Sv', source_path=None,

# Get Sv by validating path and calibrate if not already done
if self.Sv is not None:
print('%s Use Sv stored in memory to calculate MVBS.' % dt.datetime.now().strftime('%H:%M:%S'))
print('%s use Sv stored in memory to calculate MVBS.' % dt.datetime.now().strftime('%H:%M:%S'))
print_src = False
else:
print_src = True
Expand Down
2 changes: 1 addition & 1 deletion notebooks/EK60_demo_OOI.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -670,7 +670,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.7.3"
"version": "3.8.0"
}
},
"nbformat": 4,
Expand Down

0 comments on commit b77ef6d

Please sign in to comment.