From 897b88c1363afed8575388101a267e65269cf7c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Olav=20M=C3=B8yner?= <olav.moyner@gmail.com>
Date: Tue, 15 Oct 2024 11:18:40 +0200
Subject: [PATCH] Bump version, add keywords

---
 Project.toml                        | 2 +-
 src/InputParser/InputParser.jl      | 2 --
 src/InputParser/keywords/props.jl   | 5 +++++
 src/InputParser/keywords/runspec.jl | 8 ++++++++
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/Project.toml b/Project.toml
index 2637fa9..ca05791 100644
--- a/Project.toml
+++ b/Project.toml
@@ -1,7 +1,7 @@
 name = "GeoEnergyIO"
 uuid = "3b1dd628-313a-45bb-9d8d-8f3c48dcb5d4"
 authors = ["Olav Møyner <olav.moyner@gmail.com> and contributors"]
-version = "1.1.14"
+version = "1.1.15"
 
 [deps]
 Artifacts = "56f22d72-fd6d-98f1-02f0-08ddc0907c33"
diff --git a/src/InputParser/InputParser.jl b/src/InputParser/InputParser.jl
index 4b15f70..a669ba0 100644
--- a/src/InputParser/InputParser.jl
+++ b/src/InputParser/InputParser.jl
@@ -37,8 +37,6 @@ module InputParser
         skip_kw!(:NONNC, 0)
         skip_kw!(:NEWTRAN, 0)
         skip_kw!(:RPTGRID, 1)
-        skip_kw!(:CO2STORE, 0, PARSER_JUTULDARCY_MISSING_SUPPORT)
-        skip_kw!(:CO2STOR, 0, PARSER_JUTULDARCY_MISSING_SUPPORT)
         skip_kw!(:DIFFUSE, 0, PARSER_JUTULDARCY_MISSING_SUPPORT)
         skip_kw!(:OLDTRAN, 0, PARSER_JUTULDARCY_MISSING_SUPPORT)
         skip_kw!(:UNIFSAVE, 0)
diff --git a/src/InputParser/keywords/props.jl b/src/InputParser/keywords/props.jl
index e6fc0ad..5169fd5 100644
--- a/src/InputParser/keywords/props.jl
+++ b/src/InputParser/keywords/props.jl
@@ -32,6 +32,11 @@ function parse_keyword!(data, outer_data, units, cfg, f, ::Val{:NCOMPS})
     data["NCOMPS"] = parse(Int, only(rec))
 end
 
+function parse_keyword!(data, outer_data, units, cfg, f, ::Val{:SALINITY})
+    rec = read_record(f)
+    data["SALINITY"] = only(parse_defaulted_line(rec, [0.0]))
+end
+
 function parse_keyword!(data, outer_data, units, cfg, f, val::Union{Val{:OMEGAA}, Val{:OMEGAB}})
     k = unpack_val(val)
     out = []
diff --git a/src/InputParser/keywords/runspec.jl b/src/InputParser/keywords/runspec.jl
index 3f280f0..1ce180a 100644
--- a/src/InputParser/keywords/runspec.jl
+++ b/src/InputParser/keywords/runspec.jl
@@ -53,6 +53,14 @@ function parse_keyword!(data, outer_data, units, cfg, f, ::Val{:DISGAS})
     data["DISGAS"] = true
 end
 
+function parse_keyword!(data, outer_data, units, cfg, f, ::Val{:CO2STOR})
+    data["CO2STOR"] = true
+end
+
+function parse_keyword!(data, outer_data, units, cfg, f, ::Val{:CO2STORE})
+    data["CO2STORE"] = true
+end
+
 function parse_keyword!(data, outer_data, units, cfg, f, ::Val{:NOHYST})
     data["NOHYST"] = true
 end