updates

blaylockbk · Jun 12, 2024 · 132935b · 132935b
1 parent 859adfa
commit 132935b
Show file tree

Hide file tree

Showing 11 changed files with 6,711 additions and 4,660 deletions.
diff --git a/docs/gallery/ecmwf_models/ecmwf.ipynb b/docs/gallery/ecmwf_models/ecmwf.ipynb
diff --git a/docs/gallery/noaa_models/rtma-urma.ipynb b/docs/gallery/noaa_models/rtma-urma.ipynb
diff --git a/docs/gallery/noaa_models/rtma.ipynb b/docs/gallery/noaa_models/rtma.ipynb
diff --git a/docs/gallery/usnavy_models/navgem.ipynb b/docs/gallery/usnavy_models/navgem.ipynb
diff --git a/docs/gallery/usnavy_models/nogaps.ipynb b/docs/gallery/usnavy_models/nogaps.ipynb
diff --git a/docs/user_guide/tutorial/paint_figures.ipynb b/docs/user_guide/tutorial/paint_figures.ipynb
diff --git a/herbie/models/__init__.py b/herbie/models/__init__.py
@@ -25,14 +25,13 @@
 from .hrdps import *
 from .hrrr import *
 from .nam import *
-from .navgem import *
 from .nbm import *
 from .nexrad import *
-from .nogaps import *
 from .rap import *
 from .rdps import *
 from .rrfs import *
 from .rtma import *
+from .usnavy import *
 from .urma import *
 
 # ======================================================================

diff --git a/herbie/models/navgem.py b/herbie/models/navgem.py
diff --git a/herbie/models/nogaps.py b/herbie/models/nogaps.py
diff --git a/herbie/models/usnavy.py b/herbie/models/usnavy.py
@@ -0,0 +1,82 @@
+## Added by Brian Blaylock
+## July 28, 2021
+
+
+class navgem_godae:
+    """
+    NAVGEM and NOGAPS on GODAE.
+
+    TODO: Needs work. Study the file naming convention and map to something more sensible.
+    https://usgodae.org/docs/layout/mdllayout.pns.html
+
+    - NOGAPS: 2004-2013
+    - NAVGEM: 2013-2024
+
+    File examples:
+    https://usgodae.org/ftp/outgoing/fnmoc/models/navgem_0.5/2023/2023021312/US058GMET-GR1mdl.0018_0056_00000F0RL2023021312_0105_000020-000000air_temp
+    https://usgodae.org/ftp/outgoing/fnmoc/models/nogaps/2004/2004010400/US058GMET-GR1mdl.0058_0240_00000F0RL2004010400_0100_000100-000000air_temp
+    https://usgodae.org/ftp/outgoing/fnmoc/models/nogaps/2009/2009033012/US058GMET-GR1mdl.0058_0240_00000F0RL2009033012_0105_000100-000000wnd_ucmp
+    """
+
+    def template(self):
+        self.DESCRIPTION = "Navy Global Environment Model (NAVGEM, 2013-2024) and Navy Operational Global Atmospheric Prediction (NOGAPS, 2004-2013)."
+        self.DETAILS = {
+            "godae": "https://usgodae.org/",
+            "filename_description": "https://usgodae.org/docs/layout/mdllayout.pns.html",
+        }
+        self.PRODUCTS = {
+            "GMET": "",
+            "GLND": "",
+            "GCOM": "",
+        }
+
+        # Please review https://usgodae.org/docs/layout/mdllayout.pns.html
+        self.SOURCES = {
+            "navgem": f"https://usgodae.org/ftp/outgoing/fnmoc/models/navgem_0.5/{self.date:%Y/%Y%m%d%H}/US058{self.product}-GR1mdl.0018_0056_{self.fxx:03d}00F0RL{self.date:%Y%m%d%H}_{self.level}{self.variable}",
+            "nogaps": f"https://usgodae.org/ftp/outgoing/fnmoc/models/nogaps/{self.date:%Y/%Y%m%d%H}/US058{self.product}-GR1mdl.0058_0240_{self.fxx:03d}00F0RL{self.date:%Y%m%d%H}_{self.level}{self.variable}",
+        }
+        self.LOCALFILE = f"{self.get_remoteFileName}"
+
+
+class navgem_nomads:
+    """NAVGEM data from NOMADS (last two days)."""
+
+    def template(self):
+        self.DESCRIPTION = "Navy Global Environment Model (NAVGEM) from NOMADS."
+        self.DETAILS = {
+            "NRL description": "https://www.nrlmry.navy.mil/metoc/nogaps/navgem.html",
+            "NOMADS": "https://nomads.ncep.noaa.gov/pub/data/nccf/com/fnmoc/prod/",
+        }
+        self.PRODUCTS = {
+            "none": "",
+        }
+        self.SOURCES = {
+            "nomads": f"https://nomads.ncep.noaa.gov/pub/data/nccf/com/fnmoc/prod/navgem.{self.date:%Y%m%d}/navgem_{self.date:%Y%m%d%H}f{self.fxx:03d}.grib2",
+        }
+        self.LOCALFILE = f"{self.get_remoteFileName}"
+
+
+class nogaps_ncei:
+    """Historical NOGAPS data from NCEI."""
+
+    def template(self):
+        self.DESCRIPTION = (
+            "Navy Operational Global Atmospheric Prediction System (1997-2008; GRIB1)"
+        )
+        self.DETAILS = {
+            "NCEI description": "https://www.ncei.noaa.gov/products/weather-climate-models/navy-operational-global-atmospheric-prediction?msclkid=ee48a0e7cdb911eca49b9d0ed06548f8",
+        }
+        self.PRODUCTS = {
+            "058_240": "?",
+            "058_056": "?",
+            "008_240": "?",
+            "028_240": "?",
+            "041_240": "?",
+            "078_240": "?",
+            "110_240": "?",
+        }
+        self.SOURCES = {
+            "ncei": f"https://www.ncei.noaa.gov/data/navy-operational-atmostpheric-prediction-system/access/{self.date:%Y%m}/{self.date:%Y%m%d}/nogaps-{self.product}_{self.date:%Y%m%d_%H%M}_000.grb",
+        }
+        self.LOCALFILE = f"{self.get_remoteFileName}"
+        self.IDX_SUFFIX = [".inv"]
diff --git a/herbie/paint/__init__.py b/herbie/paint/__init__.py
@@ -933,23 +933,23 @@ class USGS24:
 
 class HerbieWhite:
     name = "herbie.white"
-    colors = [red, white, blue]
+    colors = [blue, white, red]
     make_custom_cmaps(name, colors, N=7)
     cmap = plt.get_cmap(name)
     cmap2 = plt.get_cmap(name + "2")
 
 
 class HerbieTan:
     name = "herbie.tan"
-    colors = [red, tan, blue]
+    colors = [blue, tan, red]
     make_custom_cmaps(name, colors, N=7)
     cmap = plt.get_cmap(name)
     cmap2 = plt.get_cmap(name + "2")
 
 
 class HerbieBlack:
     name = "herbie.black"
-    colors = [red, black, blue]
+    colors = [blue, black, red]
     make_custom_cmaps(name, colors, N=7)
     cmap = plt.get_cmap(name)
     cmap2 = plt.get_cmap(name + "2")