Skip to content
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/user-guide/tutorials/Drifter_data_tutorial.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
"outputs": [],
"source": [
"expedition_directory = Path(\"/Users/erik/Desktop/VSC_AgulhasDrifters\")\n",
"fieldset = InputData._load_default_fieldset(expedition_directory)"
"fieldset = InputData._load_ship_fieldset(expedition_directory)"
]
},
{
Expand Down
6 changes: 3 additions & 3 deletions src/virtualship/cli/commands.py
Original file line number Diff line number Diff line change
Expand Up @@ -155,17 +155,17 @@ def fetch(path: str | Path, username: str | None, password: str | None) -> None:
"UVdata": {
"dataset_id": "cmems_mod_glo_phy-cur_anfc_0.083deg_PT6H-i",
"variables": ["uo", "vo"],
"output_filename": "default_uv.nc",
"output_filename": "ship_uv.nc",
},
"Sdata": {
"dataset_id": "cmems_mod_glo_phy-so_anfc_0.083deg_PT6H-i",
"variables": ["so"],
"output_filename": "default_s.nc",
"output_filename": "ship_s.nc",
},
"Tdata": {
"dataset_id": "cmems_mod_glo_phy-thetao_anfc_0.083deg_PT6H-i",
"variables": ["thetao"],
"output_filename": "default_t.nc",
"output_filename": "ship_t.nc",
},
}

Expand Down
20 changes: 10 additions & 10 deletions src/virtualship/expedition/input_data.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,21 +52,21 @@ def load(
else:
argo_float_fieldset = None
if load_adcp or load_ctd or load_ship_underwater_st or load_xbt:
default_fieldset = cls._load_default_fieldset(directory)
ship_fieldset = cls._load_ship_fieldset(directory)
if load_adcp:
adcp_fieldset = default_fieldset
adcp_fieldset = ship_fieldset
else:
adcp_fieldset = None
if load_ctd:
ctd_fieldset = default_fieldset
ctd_fieldset = ship_fieldset
else:
ctd_fieldset = None
if load_ship_underwater_st:
ship_underwater_st_fieldset = default_fieldset
ship_underwater_st_fieldset = ship_fieldset
else:
ship_underwater_st_fieldset = None
if load_xbt:
xbt_fieldset = default_fieldset
xbt_fieldset = ship_fieldset
else:
xbt_fieldset = None

Expand All @@ -80,12 +80,12 @@ def load(
)

@classmethod
def _load_default_fieldset(cls, directory: Path) -> FieldSet:
def _load_ship_fieldset(cls, directory: Path) -> FieldSet:
filenames = {
"U": directory.joinpath("default_uv.nc"),
"V": directory.joinpath("default_uv.nc"),
"S": directory.joinpath("default_s.nc"),
"T": directory.joinpath("default_t.nc"),
"U": directory.joinpath("ship_uv.nc"),
"V": directory.joinpath("ship_uv.nc"),
"S": directory.joinpath("ship_s.nc"),
"T": directory.joinpath("ship_t.nc"),
}
variables = {"U": "uo", "V": "vo", "S": "so", "T": "thetao"}
dimensions = {
Expand Down
6 changes: 3 additions & 3 deletions tests/expedition/expedition_dir/input_data/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
!argo_float_t.nc
!argo_float_uv.nc
!bathymetry.nc
!default_s.nc
!default_t.nc
!default_uv.nc
!ship_s.nc
!ship_t.nc
!ship_uv.nc
!drifter_t.nc
!drifter_uv.nc