Merge pull request #16 from JuliaClimate/cleanup02

Cleanup02
JuliaClimate · Feb 17, 2020 · c9f66c5 · c9f66c5
2 parents af09594 + 879bfe7
commit c9f66c5
Show file tree

Hide file tree

Showing 17 changed files with 3,584 additions and 3,517 deletions.
diff --git a/DataStructures/01_types.ipynb b/DataStructures/01_types.ipynb
diff --git a/DataStructures/02_exchanges.ipynb b/DataStructures/02_exchanges.ipynb
diff --git a/DataStructures/02_exchanges.jl b/DataStructures/02_exchanges.jl
@@ -8,9 +8,9 @@
 #       format_version: '1.4'
 #       jupytext_version: 1.2.4
 #   kernelspec:
-#     display_name: Julia 1.1.0
+#     display_name: Julia 1.2.0
 #     language: julia
-#     name: julia-1.1
+#     name: julia-1.2
 # ---
 
 # ## Data exchange between neighbor arrays
@@ -42,7 +42,7 @@ show(Dexch)
 
 # We can also illustrate what happened using `Plots.jl`
 
-P=heatmap(D.f[6],title="Ocean Depth (D, Face 6)",lims=(0,40))
+P=heatmap(D.f[6],title="Ocean Depth (D, Face 6)",lims=(-4,36))
 Pexch=heatmap(Dexch.f[6],title="...(Dexch, Face 6)",lims=(0,40))
 plot(P,Pexch)
 

diff --git a/DataStructures/03_smoothing.ipynb b/DataStructures/03_smoothing.ipynb
diff --git a/DataStructures/03_smoothing.jl b/DataStructures/03_smoothing.jl
@@ -8,9 +8,9 @@
 #       format_version: '1.4'
 #       jupytext_version: 1.2.4
 #   kernelspec:
-#     display_name: Julia 1.1.0
+#     display_name: Julia 1.2.0
 #     language: julia
-#     name: julia-1.1
+#     name: julia-1.2
 # ---
 
 # # Spatial diffusion / smoothing example

diff --git a/DataStructures/04_netcdf.ipynb b/DataStructures/04_netcdf.ipynb
@@ -44,7 +44,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "using NCTiles, MeshArrays\n",
+    "using NCTiles, MeshArrays, MITgcmTools\n",
     "\n",
     "if !isdir(\"../inputs/nctiles-testcases\")\n",
     "    run(`git clone https://github.com/gaelforget/nctiles-testcases ../inputs/nctiles-testcases`)\n",
@@ -314,7 +314,7 @@
     {
      "data": {
       "text/plain": [
-       "NCvar(\"ETAN\", \"m\", NCvar[NCvar(\"lon_c\", \"degrees_east\", (720,), -179.75:0.5:179.75, Dict(\"long_name\"=>\"longitude\"), NCDatasets), NCvar(\"lat_c\", \"degrees_north\", (360,), -89.75:0.5:89.75, Dict(\"long_name\"=>\"longitude\"), NCDatasets), NCvar(\"tim\", \"days since 1992-01-01 0:0:0\", Inf, 1.5:3.0:718.5, Dict(\"long_name\"=>\"time\",\"standard_name\"=>\"time\"), NCDatasets)], BinData([\"../inputs/nctiles-testcases/diags_interp/ETAN/ETAN.0000000732.data\", \"../inputs/nctiles-testcases/diags_interp/ETAN/ETAN.0000001428.data\", \"../inputs/nctiles-testcases/diags_interp/ETAN/ETAN.0000002172.data\"], Float32, (720, 360), 1), Dict(\"long_name\"=>\"Surface Height Anomaly\"), NCDatasets)"
+       "NCvar(\"ETAN\", \"m\", NCvar[NCvar(\"lon_c\", \"degrees_east\", (720,), -179.75:0.5:179.75, Dict(\"long_name\" => \"longitude\"), NCDatasets), NCvar(\"lat_c\", \"degrees_north\", (360,), -89.75:0.5:89.75, Dict(\"long_name\" => \"longitude\"), NCDatasets), NCvar(\"tim\", \"days since 1992-01-01 0:0:0\", Inf, 1.5:3.0:718.5, Dict(\"long_name\" => \"time\",\"standard_name\" => \"time\"), NCDatasets)], BinData([\"../inputs/nctiles-testcases/diags_interp/ETAN/ETAN.0000000732.data\", \"../inputs/nctiles-testcases/diags_interp/ETAN/ETAN.0000001428.data\", \"../inputs/nctiles-testcases/diags_interp/ETAN/ETAN.0000002172.data\"], Float32, (720, 360), 1), Dict(\"long_name\" => \"Surface Height Anomaly\"), NCDatasets)"
       ]
      },
      "execution_count": 9,
@@ -438,7 +438,7 @@
     {
      "data": {
       "text/plain": [
-       "NCvar(\"thic\", \"m\", NCvar[NCvar(\"dep_l\", \"m\", (50,), Float32[10.0, 20.0, 30.0, 40.0, 50.0, 60.0, 70.0, 80.01, 90.04, 100.15  …  2854.0, 3126.5, 3422.0, 3740.5, 4082.0, 4446.5, 4834.0, 5244.5, 5678.0, 6134.5], Dict(\"long_name\"=>\"depth\",\"standard_name\"=>\"depth\",\"positive\"=>\"down\"), NCDatasets)], Float32[10.0, 10.0, 10.0, 10.0, 10.0, 10.0, 10.005, 10.02, 10.07, 10.215  …  261.0, 284.0, 307.0, 330.0, 353.0, 376.0, 399.0, 422.0, 445.0, 228.25], Dict(\"standard_name\"=>\"cell_thickness\"), NCDatasets)"
+       "NCvar(\"thic\", \"m\", NCvar[NCvar(\"dep_l\", \"m\", (50,), Float32[10.0, 20.0, 30.0, 40.0, 50.0, 60.0, 70.0, 80.01, 90.04, 100.15  …  2854.0, 3126.5, 3422.0, 3740.5, 4082.0, 4446.5, 4834.0, 5244.5, 5678.0, 6134.5], Dict(\"long_name\" => \"depth\",\"standard_name\" => \"depth\",\"positive\" => \"down\"), NCDatasets)], Float32[10.0, 10.0, 10.0, 10.0, 10.0, 10.0, 10.005, 10.02, 10.07, 10.215  …  261.0, 284.0, 307.0, 330.0, 353.0, 376.0, 399.0, 422.0, 445.0, 228.25], Dict(\"standard_name\" => \"cell_thickness\"), NCDatasets)"
       ]
      },
      "execution_count": 13,
@@ -744,15 +744,15 @@
    "formats": "ipynb,jl:light"
   },
   "kernelspec": {
-   "display_name": "Julia 1.1.0",
+   "display_name": "Julia 1.2.0",
    "language": "julia",
-   "name": "julia-1.1"
+   "name": "julia-1.2"
   },
   "language_info": {
    "file_extension": ".jl",
    "mimetype": "application/julia",
    "name": "julia",
-   "version": "1.1.0"
+   "version": "1.2.0"
   },
   "toc": {
    "base_numbering": 1,

diff --git a/DataStructures/04_netcdf.jl b/DataStructures/04_netcdf.jl
@@ -8,9 +8,9 @@
 #       format_version: '1.4'
 #       jupytext_version: 1.2.4
 #   kernelspec:
-#     display_name: Julia 1.1.0
+#     display_name: Julia 1.2.0
 #     language: julia
-#     name: julia-1.1
+#     name: julia-1.2
 # ---
 
 # # NCTiles.jl examples
@@ -37,7 +37,7 @@
 # _These will be used throughout the notebook_
 
 # +
-using NCTiles, MeshArrays
+using NCTiles, MeshArrays, MITgcmTools
 
 if !isdir("../inputs/nctiles-testcases")
     run(`git clone https://github.com/gaelforget/nctiles-testcases ../inputs/nctiles-testcases`)

diff --git a/Manifest.toml b/Manifest.toml
@@ -35,9 +35,9 @@ version = "0.0.3"
 
 [[CMake]]
 deps = ["BinDeps"]
-git-tree-sha1 = "c67a8689dc5444adc5eb2be7d837100340ecba11"
+git-tree-sha1 = "50a8b41d2c562fccd9ab841085fc7d1e2706da82"
 uuid = "631607c0-34d2-5d66-819e-eb0f9aa2061a"
-version = "1.1.2"
+version = "1.2.0"
 
 [[CMakeWrapper]]
 deps = ["BinDeps", "CMake", "Libdl", "Parameters", "Test"]
@@ -139,6 +139,12 @@ git-tree-sha1 = "a0c901c29c0e7c763342751c0a94211d56c0de5c"
 uuid = "59287772-0a20-5a39-b81b-1366585eb4c0"
 version = "0.4.1"
 
+[[FortranFiles]]
+deps = ["Compat"]
+git-tree-sha1 = "261d0569724da4c9bd906586880a2ad0cc29c2a4"
+uuid = "c58ffaec-ab22-586d-bfc5-781a99fd0b10"
+version = "0.5.0"
+
 [[GR]]
 deps = ["Base64", "DelimitedFiles", "LinearAlgebra", "Printf", "Random", "Serialization", "Sockets", "Test"]
 git-tree-sha1 = "c690c2ab22ac9ee323d9966deae61a089362b25c"
@@ -215,9 +221,9 @@ version = "0.3.1"
 
 [[MeshArrays]]
 deps = ["CatViews", "Printf", "SparseArrays", "Statistics"]
-git-tree-sha1 = "37f08e9b7ea8b1dfd1d982ba8c11572ed8d1c677"
+git-tree-sha1 = "fdaa2e5d885b858f9456fd83f2010072d4eab8eb"
 uuid = "cb8c808f-1acf-59a3-9d2b-6e38d009f683"
-version = "0.2.5"
+version = "0.2.6"
 
 [[Missings]]
 deps = ["DataAPI"]
@@ -236,9 +242,9 @@ version = "0.9.5"
 
 [[NCTiles]]
 deps = ["Dates", "MeshArrays", "NCDatasets", "NetCDF", "Printf"]
-git-tree-sha1 = "61acfd5c356703132faa7ace9f4191829edfc4ca"
+git-tree-sha1 = "35a2287e387d8906b04d93a49088edabe297e517"
 uuid = "4c1fdd90-559f-11e9-1abf-07ceafc4ffc0"
-version = "0.1.5"
+version = "0.1.6"
 
 [[NaNMath]]
 git-tree-sha1 = "928b8ca9b2791081dc71a51c55347c27c618760f"
@@ -361,9 +367,9 @@ uuid = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
 
 [[StatsBase]]
 deps = ["DataAPI", "DataStructures", "LinearAlgebra", "Missings", "Printf", "Random", "SortingAlgorithms", "SparseArrays", "Statistics"]
-git-tree-sha1 = "c53e809e63fe5cf5de13632090bc3520649c9950"
+git-tree-sha1 = "be5c7d45daa449d12868f4466dbf5882242cf2d9"
 uuid = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
-version = "0.32.0"
+version = "0.32.1"
 
 [[Test]]
 deps = ["Distributed", "InteractiveUtils", "Logging", "Random"]