Fix typos

slimgroup · Oct 15, 2023 · 5bbbc17 · 5bbbc17
1 parent b2bb351
commit 5bbbc17
Show file tree

Hide file tree

Showing 18 changed files with 37 additions and 29 deletions.
diff --git a/Manifest.tooml → Manifest.toml b/Manifest.tooml → Manifest.toml
@@ -530,9 +530,9 @@ version = "0.1.1"
 
 [[deps.FNO4CO2]]
 deps = ["AzSessions", "AzStorage", "AzureClusterlessHPC", "BSON", "BenchmarkTools", "CUDA", "Distributions", "DrWatson", "FFTW", "Flux", "HDF5", "Images", "InvertibleNetworks", "JLD2", "JSON", "JUDI", "LineSearches", "LinearAlgebra", "MAT", "NNlib", "ProgressMeter", "PyCall", "PyPlot", "Random", "Serialization", "SetIntersectionProjection", "Statistics", "Zygote"]
-git-tree-sha1 = "376070ac6373c0f3a9064fa64c0d2009f672ba5e"
-repo-rev = "master"
-repo-url = "https://github.com/slimgroup/FNO4CO2.git"
+git-tree-sha1 = "639cf18ecfe3e81f6fc5d57cdf29680cc3691836"
+repo-rev = "v1.1.4"
+repo-url = "https://github.com/slimgroup/FNO4CO2/"
 uuid = "4f87af30-b322-4a0d-8c7c-fe8b2256665a"
 version = "1.1.3"
 
@@ -739,10 +739,10 @@ uuid = "6218d12a-5da1-5696-b52f-db25d2ecc6d1"
 version = "1.2.1"
 
 [[deps.ImageMagick_jll]]
-deps = ["Artifacts", "Ghostscript_jll", "JLLWrappers", "JpegTurbo_jll", "Libdl", "Libtiff_jll", "Pkg", "Zlib_jll", "libpng_jll"]
-git-tree-sha1 = "124626988534986113cfd876e3093e4a03890f58"
+deps = ["Artifacts", "Ghostscript_jll", "JLLWrappers", "JpegTurbo_jll", "Libdl", "Libtiff_jll", "OpenJpeg_jll", "Pkg", "Zlib_jll", "libpng_jll"]
+git-tree-sha1 = "7607ad4100c75908a79ff31fabb792cd37711d70"
 uuid = "c73af94c-d91f-53ed-93a7-00f77d67a9d7"
-version = "6.9.12+3"
+version = "6.9.12+4"
 
 [[deps.ImageMetadata]]
 deps = ["AxisArrays", "ImageAxes", "ImageBase", "ImageCore"]
@@ -1073,6 +1073,12 @@ git-tree-sha1 = "a58ab1d18efa0bcf9f0868c6d387e4126dad3e72"
 uuid = "5c8ed15e-5a4c-59e4-a42b-c7e8811fb125"
 version = "2.5.2"
 
+[[deps.LittleCMS_jll]]
+deps = ["Artifacts", "JLLWrappers", "JpegTurbo_jll", "Libdl", "Libtiff_jll", "Pkg"]
+git-tree-sha1 = "110897e7db2d6836be22c18bffd9422218ee6284"
+uuid = "d3a379c0-f9a3-5b72-a4c0-6bf4d2e8af0f"
+version = "2.12.0+0"
+
 [[deps.LogExpFunctions]]
 deps = ["ChainRulesCore", "ChangesOfVariables", "DocStringExtensions", "InverseFunctions", "IrrationalConstants", "LinearAlgebra"]
 git-tree-sha1 = "c3ce8e7420b3a6e071e0fe4745f5d4300e37b13f"
@@ -1137,9 +1143,9 @@ version = "0.1.8"
 
 [[deps.MPItrampoline_jll]]
 deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "LazyArtifacts", "Libdl", "MPIPreferences", "TOML"]
-git-tree-sha1 = "b3dcf8e1c610a10458df3c62038c8cc3a4d6291d"
+git-tree-sha1 = "228d5366a7c89b3c81469592b6f4c612db693d50"
 uuid = "f1f71cc9-e9ae-5b93-9b94-4fe0e1ad3748"
-version = "5.3.0+0"
+version = "5.3.0+1"
 
 [[deps.MacroTools]]
 deps = ["Markdown", "Random"]
@@ -1336,6 +1342,12 @@ git-tree-sha1 = "a4ca623df1ae99d09bc9868b008262d0c0ac1e4f"
 uuid = "18a262bb-aa17-5467-a713-aee519bc75cb"
 version = "3.1.4+0"
 
+[[deps.OpenJpeg_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Libtiff_jll", "LittleCMS_jll", "Pkg", "libpng_jll"]
+git-tree-sha1 = "76374b6e7f632c130e78100b166e5a48464256f8"
+uuid = "643b3616-a352-519d-856d-80112ee9badc"
+version = "2.4.0+0"
+
 [[deps.OpenLibm_jll]]
 deps = ["Artifacts", "Libdl"]
 uuid = "05823500-19ac-5b8b-9628-191a04bc5112"

diff --git a/README.md b/README.md
@@ -24,12 +24,7 @@ We use [FNO4CO2.jl] to train the Fourier neural operators (FNOs) as learned surr
 
 ## Installation
 
-First, install [Julia](https://julialang.org/) and [Python](https://www.python.org/). Next, run the command below to install the required packages.
-
-```bash
-julia -e 'Pkg.add("DrWatson.jl")'
-julia --project -e 'using Pkg; Pkg.instantiate()'
-```
+First, install [Julia](https://julialang.org/) and [Python](https://www.python.org/). The scripts will contain package installation commands at the beginning so the packages used in the experiments will be automatically installed.
 
 ## Scripts
 

diff --git a/scripts/combine-fno-nf.jl b/scripts/combine-fno-nf.jl
@@ -7,7 +7,7 @@
 
 using DrWatson
 @quickactivate "FNO-NF"
-
+using Pkg; Pkg.add(url="https://github.com/slimgroup/FNO4CO2/", rev="v1.1.4")
 using Pkg; Pkg.instantiate();
 
 nthreads = try

diff --git a/scripts/combine-fno.jl b/scripts/combine-fno.jl
@@ -7,7 +7,7 @@
 
 using DrWatson
 @quickactivate "FNO-NF"
-
+using Pkg; Pkg.add(url="https://github.com/slimgroup/FNO4CO2/", rev="v1.1.4")
 using Pkg; Pkg.instantiate();
 
 nthreads = try

diff --git a/scripts/combine-jutul-nf.jl b/scripts/combine-jutul-nf.jl
@@ -7,7 +7,7 @@
 
 using DrWatson
 @quickactivate "FNO-NF"
-
+using Pkg; Pkg.add(url="https://github.com/slimgroup/FNO4CO2/", rev="v1.1.4")
 using Pkg; Pkg.instantiate();
 
 nthreads = try

diff --git a/scripts/combine-jutul.jl b/scripts/combine-jutul.jl
@@ -7,7 +7,7 @@
 
 using DrWatson
 @quickactivate "FNO-NF"
-
+using Pkg; Pkg.add(url="https://github.com/slimgroup/FNO4CO2/", rev="v1.1.4")
 using Pkg; Pkg.instantiate();
 
 nthreads = try

diff --git a/scripts/gen_perm_conc_pairs.jl b/scripts/gen_perm_conc_pairs.jl
@@ -2,7 +2,7 @@
 
 using DrWatson
 @quickactivate "FNO-NF"
-
+using Pkg; Pkg.add(url="https://github.com/slimgroup/FNO4CO2/", rev="v1.1.4")
 using Pkg; Pkg.instantiate();
 
 nthreads = try

diff --git a/scripts/projection-study.jl b/scripts/projection-study.jl
@@ -5,7 +5,7 @@
 
 using DrWatson
 @quickactivate "FNO-NF"
-
+using Pkg; Pkg.add(url="https://github.com/slimgroup/FNO4CO2/", rev="v1.1.4")
 using Pkg; Pkg.instantiate();
 
 nthreads = try

diff --git a/scripts/seismic-fno-nf.jl b/scripts/seismic-fno-nf.jl
@@ -7,7 +7,7 @@
 
 using DrWatson
 @quickactivate "FNO-NF"
-
+using Pkg; Pkg.add(url="https://github.com/slimgroup/FNO4CO2/", rev="v1.1.4")
 using Pkg; Pkg.instantiate();
 
 nthreads = try

diff --git a/scripts/seismic-fno.jl b/scripts/seismic-fno.jl
@@ -7,7 +7,7 @@
 
 using DrWatson
 @quickactivate "FNO-NF"
-
+using Pkg; Pkg.add(url="https://github.com/slimgroup/FNO4CO2/", rev="v1.1.4")
 using Pkg; Pkg.instantiate();
 
 nthreads = try

diff --git a/scripts/seismic-jutul-nf.jl b/scripts/seismic-jutul-nf.jl
@@ -7,7 +7,7 @@
 
 using DrWatson
 @quickactivate "FNO-NF"
-
+using Pkg; Pkg.add(url="https://github.com/slimgroup/FNO4CO2/", rev="v1.1.4")
 using Pkg; Pkg.instantiate();
 
 nthreads = try

diff --git a/scripts/seismic-jutul.jl b/scripts/seismic-jutul.jl
@@ -7,7 +7,7 @@
 
 using DrWatson
 @quickactivate "FNO-NF"
-
+using Pkg; Pkg.add(url="https://github.com/slimgroup/FNO4CO2/", rev="v1.1.4")
 using Pkg; Pkg.instantiate();
 
 nthreads = try

diff --git a/scripts/train_FNO.jl b/scripts/train_FNO.jl
@@ -4,7 +4,7 @@
 
 using DrWatson
 @quickactivate "FNO-NF"
-
+using Pkg; Pkg.add(url="https://github.com/slimgroup/FNO4CO2/", rev="v1.1.4")
 using Pkg; Pkg.instantiate();
 
 using FNO4CO2

diff --git a/scripts/train_NF.jl b/scripts/train_NF.jl
@@ -1,5 +1,6 @@
 using DrWatson
 @quickactivate "FNO-NF"
+using Pkg; Pkg.add(url="https://github.com/slimgroup/FNO4CO2/", rev="v1.1.4")
 using Pkg; Pkg.instantiate()
 using InvertibleNetworks
 using JLD2

diff --git a/scripts/well-fno-nf.jl b/scripts/well-fno-nf.jl
@@ -7,7 +7,7 @@
 
 using DrWatson
 @quickactivate "FNO-NF"
-
+using Pkg; Pkg.add(url="https://github.com/slimgroup/FNO4CO2/", rev="v1.1.4")
 using Pkg; Pkg.instantiate();
 
 nthreads = try

diff --git a/scripts/well-fno.jl b/scripts/well-fno.jl
@@ -7,7 +7,7 @@
 
 using DrWatson
 @quickactivate "FNO-NF"
-
+using Pkg; Pkg.add(url="https://github.com/slimgroup/FNO4CO2/", rev="v1.1.4")
 using Pkg; Pkg.instantiate();
 
 nthreads = try

diff --git a/scripts/well-jutul-nf.jl b/scripts/well-jutul-nf.jl
@@ -7,7 +7,7 @@
 
 using DrWatson
 @quickactivate "FNO-NF"
-
+using Pkg; Pkg.add(url="https://github.com/slimgroup/FNO4CO2/", rev="v1.1.4")
 using Pkg; Pkg.instantiate();
 
 nthreads = try

diff --git a/scripts/well-jutul.jl b/scripts/well-jutul.jl
@@ -7,7 +7,7 @@
 
 using DrWatson
 @quickactivate "FNO-NF"
-
+using Pkg; Pkg.add(url="https://github.com/slimgroup/FNO4CO2/", rev="v1.1.4")
 using Pkg; Pkg.instantiate();
 
 nthreads = try