NREL · MDKempe · Sep 13, 2024 · Sep 15, 2024 · Sep 16, 2024 · Sep 16, 2024
diff --git a/docs/source/_autosummary/pvdeg.geospatial.plot_sparse_analysis_land.rst b/docs/source/_autosummary/pvdeg.geospatial.plot_sparse_analysis_land.rst
@@ -0,0 +1,6 @@
+pvdeg.geospatial.plot\_sparse\_analysis\_land
+=============================================
+
+.. currentmodule:: pvdeg.geospatial
+
+.. autofunction:: plot_sparse_analysis_land
diff --git a/docs/source/_autosummary/pvdeg.geospatial.rst b/docs/source/_autosummary/pvdeg.geospatial.rst
@@ -34,6 +34,7 @@ pvdeg.geospatial
       pvdeg.geospatial.plot_Europe
       pvdeg.geospatial.plot_USA
       pvdeg.geospatial.plot_sparse_analysis
+      pvdeg.geospatial.plot_sparse_analysis_land
       pvdeg.geospatial.start_dask
       pvdeg.geospatial.template_parameters
       pvdeg.geospatial.zero_template
@@ -157,6 +158,13 @@ pvdeg.geospatial
    .. minigallery:: pvdeg.geospatial.plot_sparse_analysis
        :add-heading:
 
+   .. autofunction:: plot_sparse_analysis_land
+
+   .. _sphx_glr_backref_pvdeg.geospatial.plot_sparse_analysis_land:
+
+   .. minigallery:: pvdeg.geospatial.plot_sparse_analysis_land
+       :add-heading:
+
    .. autofunction:: start_dask
 
    .. _sphx_glr_backref_pvdeg.geospatial.start_dask:

diff --git a/docs/source/_autosummary/pvdeg.utilities.display_json.rst b/docs/source/_autosummary/pvdeg.utilities.display_json.rst
@@ -0,0 +1,6 @@
+pvdeg.utilities.display\_json
+=============================
+
+.. currentmodule:: pvdeg.utilities
+
+.. autofunction:: display_json
diff --git a/docs/source/_autosummary/pvdeg.utilities.linear_normalize.rst b/docs/source/_autosummary/pvdeg.utilities.linear_normalize.rst
@@ -0,0 +1,6 @@
+pvdeg.utilities.linear\_normalize
+=================================
+
+.. currentmodule:: pvdeg.utilities
+
+.. autofunction:: linear_normalize
diff --git a/docs/source/_autosummary/pvdeg.utilities.merge_sparse.rst b/docs/source/_autosummary/pvdeg.utilities.merge_sparse.rst
@@ -0,0 +1,6 @@
+pvdeg.utilities.merge\_sparse
+=============================
+
+.. currentmodule:: pvdeg.utilities
+
+.. autofunction:: merge_sparse
diff --git a/docs/source/_autosummary/pvdeg.utilities.read_material.rst b/docs/source/_autosummary/pvdeg.utilities.read_material.rst
@@ -0,0 +1,6 @@
+pvdeg.utilities.read\_material
+==============================
+
+.. currentmodule:: pvdeg.utilities
+
+.. autofunction:: read_material
diff --git a/docs/source/_autosummary/pvdeg.utilities.rst b/docs/source/_autosummary/pvdeg.utilities.rst
@@ -21,17 +21,22 @@ pvdeg.utilities
 
       pvdeg.utilities.compare_templates
       pvdeg.utilities.convert_tmy
+      pvdeg.utilities.display_json
       pvdeg.utilities.fix_metadata
       pvdeg.utilities.geospatial_from_csv
       pvdeg.utilities.get_kinetics
       pvdeg.utilities.get_state_bbox
       pvdeg.utilities.gid_downsampling
+      pvdeg.utilities.linear_normalize
+      pvdeg.utilities.merge_sparse
       pvdeg.utilities.meta_as_dict
       pvdeg.utilities.new_id
       pvdeg.utilities.nrel_kestrel_check
       pvdeg.utilities.quantile_df
+      pvdeg.utilities.read_material
       pvdeg.utilities.remove_scenario_filetrees
       pvdeg.utilities.restore_gids
+      pvdeg.utilities.search_json
       pvdeg.utilities.strip_normalize_tmy
       pvdeg.utilities.tilt_azimuth_scan
       pvdeg.utilities.ts_gid_df
@@ -65,6 +70,13 @@ pvdeg.utilities
    .. minigallery:: pvdeg.utilities.convert_tmy
        :add-heading:
 
+   .. autofunction:: display_json
+
+   .. _sphx_glr_backref_pvdeg.utilities.display_json:
+
+   .. minigallery:: pvdeg.utilities.display_json
+       :add-heading:
+
    .. autofunction:: fix_metadata
 
    .. _sphx_glr_backref_pvdeg.utilities.fix_metadata:
@@ -100,6 +112,20 @@ pvdeg.utilities
    .. minigallery:: pvdeg.utilities.gid_downsampling
        :add-heading:
 
+   .. autofunction:: linear_normalize
+
+   .. _sphx_glr_backref_pvdeg.utilities.linear_normalize:
+
+   .. minigallery:: pvdeg.utilities.linear_normalize
+       :add-heading:
+
+   .. autofunction:: merge_sparse
+
+   .. _sphx_glr_backref_pvdeg.utilities.merge_sparse:
+
+   .. minigallery:: pvdeg.utilities.merge_sparse
+       :add-heading:
+
    .. autofunction:: meta_as_dict
 
    .. _sphx_glr_backref_pvdeg.utilities.meta_as_dict:
@@ -128,6 +154,13 @@ pvdeg.utilities
    .. minigallery:: pvdeg.utilities.quantile_df
        :add-heading:
 
+   .. autofunction:: read_material
+
+   .. _sphx_glr_backref_pvdeg.utilities.read_material:
+
+   .. minigallery:: pvdeg.utilities.read_material
+       :add-heading:
+
    .. autofunction:: remove_scenario_filetrees
 
    .. _sphx_glr_backref_pvdeg.utilities.remove_scenario_filetrees:
@@ -142,6 +175,13 @@ pvdeg.utilities
    .. minigallery:: pvdeg.utilities.restore_gids
        :add-heading:
 
+   .. autofunction:: search_json
+
+   .. _sphx_glr_backref_pvdeg.utilities.search_json:
+
+   .. minigallery:: pvdeg.utilities.search_json
+       :add-heading:
+
    .. autofunction:: strip_normalize_tmy
 
    .. _sphx_glr_backref_pvdeg.utilities.strip_normalize_tmy:

diff --git a/docs/source/_autosummary/pvdeg.utilities.search_json.rst b/docs/source/_autosummary/pvdeg.utilities.search_json.rst
@@ -0,0 +1,6 @@
+pvdeg.utilities.search\_json
+============================
+
+.. currentmodule:: pvdeg.utilities
+
+.. autofunction:: search_json
diff --git a/docs/source/whatsnew/index.rst b/docs/source/whatsnew/index.rst
@@ -4,7 +4,8 @@ What's New
 ==========
 PVDegradationTools (pvdeg) change log:
 
-
+.. include:: releases/v0.4.3.rst
+.. include:: releases/v0.4.2.rst
 .. include:: releases/v0.4.1.rst
 .. include:: releases/v0.4.0.rst
 .. include:: releases/v0.3.3.rst

diff --git a/docs/source/whatsnew/releases/v0.4.2.rst b/docs/source/whatsnew/releases/v0.4.2.rst
@@ -13,4 +13,4 @@ Tests
 Contributors
 ~~~~~~~~~~~~
 * Martin Springer (:ghuser:`martin-springer`)
-* Aidan Wesley (:ghuser:`AidanWesley``)
+* Aidan Wesley (:ghuser:`AidanWesley``)
diff --git a/docs/source/whatsnew/releases/v0.4.3.rst b/docs/source/whatsnew/releases/v0.4.3.rst
@@ -0,0 +1,14 @@
+v0.4.3 (2024-10-10)
+===================
+
+Enhancements
+------------
+Suite of utility functions to facilitate accessing material parameter json files.
+
+* ``pvdeg.utilities.read_material`` creates a public api to replace the private ``pvdeg.untility._read_material`` function (to be deprecated soon)  
+* ``pvdeg.utilities.search_json`` to search jsons and identify keys for desired materials.  
+* ``pvdeg.utilities.display_json`` to view 2 level jsons in Jupyter Notebooks using HTML.  
+
+Contributors
+-----------
+* Tobin Ford (:ghuser:`tobin-ford`)
diff --git a/pvdeg/__init__.py b/pvdeg/__init__.py
@@ -12,7 +12,7 @@
 from . import humidity
 from . import letid
 from . import montecarlo
-from . import scenario
+from .scenario import Scenario, GeospatialScenario
 from . import spectral
 from . import symbolic
 from . import standards

diff --git a/pvdeg/data/H2Opermeation.json b/pvdeg/data/H2Opermeation.json
@@ -22,11 +22,11 @@
 		"source": "unpublished measurements",
 		"Fickian": true,
 		"Ead": 61.4781422330562,
-		"Do": 25790.6020262449,
+		"Do": 257.906020262449,
 		"Eas": 5.88752263485353,
-		"So": 0.00982242435416737,
-		"Eap": 67.3656648679097,
-		"Po": 5559396276.60964
+		"So": 0.0982242435416737,
+		"Eap": 66.9611315410624,
+		"Po": 189338932521.637
     },
     "W003": {
 		"name": "Coveme",

diff --git a/pvdeg/data/O2permeation.json b/pvdeg/data/O2permeation.json
@@ -36,10 +36,10 @@
         "Fickian": true,
         "Ead": 29.43112031,
         "Do": 0.129061678,
-        "Eas": 32.3137806,
-        "So": 87.81142774,
-        "Eap": 61.7449009,
-        "Po": 97917899126
+        "Eas": 16.6314948252219,
+        "So": 0.136034525059804,
+        "Eap": 49.1083457348515,
+        "Po": 528718258.338532
     },
     "OX004": {
         "name": "AAA polyamide backsheet",