ENH-SEA021 #5
ENH-SEA021 #5
Conversation
| rm -f realtime_rawnc/* | ||
| rm -f L1-timeseries/* | ||
| rm -f L1-profiles/* | ||
| rm -f L2-gridfiles/* |
There was a problem hiding this comment.
Will need to make these all L0 to match the rest of the repo
| long_name: oxygen concentration | ||
| standard_name: mole_concentration_of_dissolved_molecular_oxygen_in_sea_water | ||
| units: umol l-1 | ||
| coordinates: time depth latitude longitude |
There was a problem hiding this comment.
Perhaps swap the units for "unknown" if we're not sure what the oxygen is doing here
| # Make level-1 timeseries netcdf file from th raw files... | ||
| outname = seaexplorer.raw_to_L0timeseries(rawncdir, l0tsdir, deploymentyaml, kind='sub') | ||
| ncprocess.extract_L1timeseries_profiles(outname, profiledir, deploymentyaml) | ||
| outname2 = ncprocess.make_L2_gridfiles(outname, griddir, deploymentyaml) |
There was a problem hiding this comment.
these two lines will need to use extract_L0timeseries_profiles and make_L2_gridfiles respectively
| pldGPCTD = pldGPCTD.drop_vars(arod) | ||
| for vars in [flbbcd, arod]: | ||
| try: | ||
| pldGPCTD = pldGPCTD.drop_vars(vars) |
There was a problem hiding this comment.
This example runs with the changes to pyglider/seaexplorer.py made in #14 which is promising.
I tested the results by compaing the dataset produced by this version of seaexplorer.py and the one in #14 using the xarray equals function they are identical. So we can use either this version or that suggested in #14 no problem. This could also be a handy function for testing purposes
jklymak
force-pushed
the
main
branch
3 times, most recently
from
fc6deb2 to
9cec8bf
Compare
|
6651931 (via #210) introduced a bunch of formatting changes that will likely cause merge conflicts. Here are merge and rebase workflows to avoid these conflicts (it depends on having I recommend first creating a # merge all the way up to the commit that introduced the formatting changes
git merge 66519318^1
# merge the commit that introduced the formatting changes, prioritising the working branch during conflicts
git merge -s ours 66519318 --no-commit
pre-commit run --all-files
git commit --no-edit
# merge the rest of the way
git merge mainor by doing a rebase (if you want a clean history) # Rebase up to the commit introducing formatting changes
git rebase 66519318^1
# Rebase onto the commit introducing formatting changes.
# Accept working branch changes (i.e., "theirs" during rebase
# - different to merge. See git rebase docs) during conflicts.
# During the rebase we will run the formatter after applying
# changes from commits, before committing so that everything is compliant.
git rebase -X theirs -i 66519318
# Replace all "pick" with "edit" or "e". Start the rebase...
# Repeatedly run
git add -u && pre-commit run --all-files && git rebase --continue
# to run pre-commit tooling, stage modified files, and continue
# until rebase is complete. Sometimes pre-commit can't autofix
# issues, then you need to fix them manually.
# If you make a mistake you can always do `git rebase --abort`
# Finally, rebase onto main
git rebase main |
3 participants
Some changes to make SEA021 work. Don't have correct info in deployment.yml yet, and I have no idea what units the O2 measurements are in, but at least they are processed bu these changes....