tmove MOM6 netcdf read to ocean.jl - Granular.jl - Julia package for granular dynamics simulation
(HTM) git clone git://src.adamsgaard.dk/Granular.jl
(DIR) Log
(DIR) Files
(DIR) Refs
(DIR) README
(DIR) LICENSE
---
(DIR) commit 7738dd99c78168b534c9b206f1a84efdf2f9f112
(DIR) parent 3d6d97cde628bafaecd2d428b7a58c147faba650
(HTM) Author: Anders Damsgaard <andersd@riseup.net>
Date: Fri, 21 Apr 2017 16:37:54 -0400
move MOM6 netcdf read to ocean.jl
Diffstat:
M src/io.jl | 27 ---------------------------
M src/ocean.jl | 27 +++++++++++++++++++++++++++
M test/netcdf.jl | 2 +-
3 files changed, 28 insertions(+), 28 deletions(-)
---
(DIR) diff --git a/src/io.jl b/src/io.jl
t@@ -68,30 +68,3 @@ function writeVTK(simulation::Simulation;
return nothing
end
end
-
-"""
-Read NetCDF file generated by MOM6 (e.g. `prog__####_###.nc`) from disk and
-return as `Ocean` data structure.
-"""
-function readNetCDF(filename::String)
-
- if !isfile(filename)
- error("$(filename) could not be opened")
- end
-
- ocean = Ocean(filename,
- NetCDF.ncread(filename, "Time"),
-
- NetCDF.ncread(filename, "xq"),
- NetCDF.ncread(filename, "yq"),
- NetCDF.ncread(filename, "xh"),
- NetCDF.ncread(filename, "yh"),
- NetCDF.ncread(filename, "zl"),
- NetCDF.ncread(filename, "zi"),
-
- NetCDF.ncread(filename, "u"),
- NetCDF.ncread(filename, "v"),
- NetCDF.ncread(filename, "h"),
- NetCDF.ncread(filename, "e"))
- return ocean
-end
(DIR) diff --git a/src/ocean.jl b/src/ocean.jl
t@@ -13,3 +13,30 @@ function createEmptyOcean()
zeros(1,1,1,1),
zeros(1,1,1,1))
end
+
+"""
+Read NetCDF file generated by MOM6 (e.g. `prog__####_###.nc`) from disk and
+return as `Ocean` data structure.
+"""
+function readOceanNetCDF(filename::String)
+
+ if !isfile(filename)
+ error("$(filename) could not be opened")
+ end
+
+ ocean = Ocean(filename,
+ NetCDF.ncread(filename, "Time"),
+
+ NetCDF.ncread(filename, "xq"),
+ NetCDF.ncread(filename, "yq"),
+ NetCDF.ncread(filename, "xh"),
+ NetCDF.ncread(filename, "yh"),
+ NetCDF.ncread(filename, "zl"),
+ NetCDF.ncread(filename, "zi"),
+
+ NetCDF.ncread(filename, "u"),
+ NetCDF.ncread(filename, "v"),
+ NetCDF.ncread(filename, "h"),
+ NetCDF.ncread(filename, "e"))
+ return ocean
+end
(DIR) diff --git a/test/netcdf.jl b/test/netcdf.jl
t@@ -8,7 +8,7 @@ import SeaIce
info("#### $(basename(@__FILE__)) ####")
info("Testing dimensions of content read from prog__0001_006.nc")
-ocean = SeaIce.readNetCDF("prog__0001_006.nc")
+ocean = SeaIce.readOceanNetCDF("prog__0001_006.nc")
@test length(ocean.xq) == 44
@test length(ocean.xh) == 44
@test length(ocean.yq) == 40