tsutterley · tsutterley · Jun 6, 2023 · Jun 6, 2023
diff --git a/doc/source/getting_started/Background.rst b/doc/source/getting_started/Background.rst
@@ -61,7 +61,7 @@ GRACE/GRACE-FO senses changes in gravity by measuring the change in distance bet
 All the onboard measurements are combined with estimates of the background gravity field, atmospheric and oceanic variability,
 and tides to create the `Level-2 spherical harmonic product of GRACE and GRACE-FO`__.
 
-.. __: https://podaac-tools.jpl.nasa.gov/drive/files/GeodeticsGravity/gracefo/docs/GRACE-FO_L2-UserHandbook_v1.1.pdf
+.. __: https://archive.podaac.earthdata.nasa.gov/podaac-ops-cumulus-docs/gracefo/open/docs/GRACE-FO_L2_UserHandbook.pdf
 
 Data Processing
 ###############

diff --git a/doc/source/getting_started/GRACE-Data-File-Formats.rst b/doc/source/getting_started/GRACE-Data-File-Formats.rst
@@ -88,5 +88,5 @@ Summary
 References
 ##########
 
-- `Product Description Document for AOD1B Release 06, Technical Document GRACE 327-750, Revision 6.1, GFZ German Research Centre for Geosciences (2017). <https://podaac-tools.jpl.nasa.gov/drive/files/allData/gracefo/docs/AOD1B_PDD_RL06_v6.1.pdf>`_
-- `GRACE Follow-On Level-2 Gravity Field Product User Handbook, Technical Document GRACE-FO D-103922, Revision 1.1, NASA Jet Propulsion Laboratory (2019). <https://podaac-tools.jpl.nasa.gov/drive/files/allData/gracefo/docs/GRACE-FO_L2_UserHandbook.pdf>`_
+- `Product Description Document for AOD1B Release 06, Technical Document GRACE 327-750, Revision 6.1, GFZ German Research Centre for Geosciences (2017). <https://archive.podaac.earthdata.nasa.gov/podaac-ops-cumulus-docs/grace/open/L1B/GFZ/AOD1B/RL04/docs/AOD1B_PDD_RL06_v6.1.pdf>`_
+- `GRACE Follow-On Level-2 Gravity Field Product User Handbook, Technical Document GRACE-FO D-103922, Revision 1.1, NASA Jet Propulsion Laboratory (2019). <https://archive.podaac.earthdata.nasa.gov/podaac-ops-cumulus-docs/gracefo/open/docs/GRACE-FO_L2_UserHandbook.pdf>`_
diff --git a/doc/source/getting_started/Getting-Started.rst b/doc/source/getting_started/Getting-Started.rst
@@ -2,7 +2,7 @@
 Getting Started
 ===============
 
-- `Register at NASA Earthdata and add PO.DAAC Drive OPS as application <./NASA-Earthdata.md>`_
+- `Register at NASA Earthdata <./NASA-Earthdata.rst>`_
 - Run `podaac_cumulus.py <https://github.com/tsutterley/gravity-toolkit/blob/main/scripts/podaac_cumulus.py>`_ program with your NASA Earthdata credentials to acquire GRACE/GRACE-FO and auxiliary data
 
 .. code-block:: bash

diff --git a/doc/source/getting_started/NASA-Earthdata.rst b/doc/source/getting_started/NASA-Earthdata.rst
@@ -29,36 +29,25 @@ during Phase 4 and Phase 5 of the transition, slated for April and July 2022 res
 If any problems contact JPL PO.DAAC support at `podaac@podaac.jpl.nasa.gov <mailto:podaac@podaac.jpl.nasa.gov>`_
 or the NASA EOSDIS support team `support@earthdata.nasa.gov <mailto:support@earthdata.nasa.gov>`_.
 
-WebDAV
-------
-JPL PO.DAAC Drive uses passwords generated using the Web Distributed Authoring and Versioning (WebDAV) API.
-This password is created at the `PO.DAAC Drive <https://podaac-tools.jpl.nasa.gov/drive/>`_ website.
-Use this password rather than your Earthdata password when retrieving model data from PO.DAAC Drive.
-`Click here for more information <https://podaac-tools.jpl.nasa.gov/drive/help>`_.
-
 Steps to Sync from PO.DAAC
 --------------------------
 
 1. `Register with NASA Earthdata Login system <https://urs.earthdata.nasa.gov/users/new>`_
-2. `After registering, login to the system <https://urs.earthdata.nasa.gov/home>`_
-3. Add ``PO.DAAC Drive OPS`` `applications to Earthdata <https://wiki.earthdata.nasa.gov/display/EL/How+To+Pre-authorize+an+application>`_
-4. `Sync time-variable gravity data <https://github.com/tsutterley/gravity-toolkit/blob/main/scripts/podaac_cumulus.py>`_
+2. `Sync time-variable gravity data using your Earthdata credentials <https://github.com/tsutterley/gravity-toolkit/blob/main/scripts/podaac_cumulus.py>`_
 
-Can also create a ``.netrc`` file for permanently storing NASA Earthdata and JPL WebDAV credentials:
+Can also create a ``.netrc`` file for permanently storing NASA Earthdata credentials:
 
 .. code-block:: bash
 
     echo "machine urs.earthdata.nasa.gov login <uid> password <password>" >> ~/.netrc
-    echo "machine podaac-tools.jpl.nasa.gov login <uid> password <webdav>" >> ~/.netrc
     chmod 0600 ~/.netrc
 
-Or set environmental variables for your NASA Earthdata and JPL WebDAV credentials:
+Or set environmental variables for your NASA Earthdata credentials:
 
 .. code-block:: bash
 
     export EARTHDATA_USERNAME=<uid>
     export EARTHDATA_PASSWORD=<password>
-    export PODAAC_PASSWORD=<webdav>
 
 NASA Common Metadata Repository
 ###############################

diff --git a/doc/source/getting_started/Resources.rst b/doc/source/getting_started/Resources.rst
@@ -25,15 +25,15 @@ Data Archives
 Product Information
 ###################
 
-- `GRACE Level-2 Gravity Field Product User Handbook <https://podaac-tools.jpl.nasa.gov/drive/files/GeodeticsGravity/grace/docs/L2-UserHandbook_v4.0.pdf>`_
-- `GRACE-FO Level-2 Gravity Field Product User Handbook <https://podaac-tools.jpl.nasa.gov/drive/files/GeodeticsGravity/gracefo/docs/GRACE-FO_L2-UserHandbook_v1.1.pdf>`_
-- `GRACE Product Description Document for AOD1B Release 06 <https://podaac-tools.jpl.nasa.gov/drive/files/GeodeticsGravity/grace/docs/AOD1B_PDD_RL06_v6.1.pdf>`_
+- `GRACE Level-2 Gravity Field Product User Handbook <https://archive.podaac.earthdata.nasa.gov/podaac-ops-cumulus-docs/grace/open/L1B/GFZ/AOD1B/RL04/docs/L2-UserHandbook_v4.0.pdf>`_
+- `GRACE-FO Level-2 Gravity Field Product User Handbook <https://archive.podaac.earthdata.nasa.gov/podaac-ops-cumulus-docs/gracefo/open/docs/GRACE-FO_L2_UserHandbook.pdf>`_
+- `GRACE Product Description Document for AOD1B Release 06 <https://archive.podaac.earthdata.nasa.gov/podaac-ops-cumulus-docs/grace/open/L1B/GFZ/AOD1B/RL04/docs/AOD1B_PDD_RL06_v6.1.pdf>`_
 
 Processing Standards
 ####################
-- `GRACE-FO CSR Level-2 Processing Standards Document <https://podaac-tools.jpl.nasa.gov/drive/files/GeodeticsGravity/gracefo/docs/GRACE-FO_L2-CSR_ProcStds_v1.1.pdf>`_
-- `GRACE-FO GFZ Level-2 Processing Standards Document <https://podaac-tools.jpl.nasa.gov/drive/files/GeodeticsGravity/gracefo/docs/GRACE-FO_L2-GFZ_ProcStds_v1.0.pdf>`_
-- `GRACE-FO JPL Level-2 Processing Standards Document <https://podaac-tools.jpl.nasa.gov/drive/files/GeodeticsGravity/gracefo/docs/GRACE-FO_L2-JPL_ProcStds_v1.0.pdf>`_
+- `GRACE-FO CSR Level-2 Processing Standards Document <https://archive.podaac.earthdata.nasa.gov/podaac-ops-cumulus-docs/gracefo/open/docs/GRACE-FO_L2-CSR_ProcStds_v1.1.pdf>`_
+- `GRACE-FO GFZ Level-2 Processing Standards Document <https://archive.podaac.earthdata.nasa.gov/podaac-ops-cumulus-docs/gracefo/open/docs/GRACE-FO_L2-GFZ_ProcStds_v1.0.pdf>`_
+- `GRACE-FO JPL Level-2 Processing Standards Document <https://archive.podaac.earthdata.nasa.gov/podaac-ops-cumulus-docs/gracefo/open/docs/GRACE-FO_L2-JPL_ProcStds_v1.0.pdf>`_
 
 Software
 ########

diff --git a/gravity_toolkit/SLR/C20.py b/gravity_toolkit/SLR/C20.py
@@ -6,18 +6,15 @@
 Reads in C20 spherical harmonic coefficients derived from SLR measurements
 
 Dataset distributed by NASA PO.DAAC
-    https://podaac-tools.jpl.nasa.gov/drive/files/GeodeticsGravity/grace/docs
-        TN-05_C20_SLR.txt
-        TN-07_C20_SLR.txt
-        TN-11_C20_SLR.txt
-        TN-14_C30_C30_GSFC_SLR.txt
+    TN-05_C20_SLR.txt
+    TN-07_C20_SLR.txt
+    TN-11_C20_SLR.txt
+    TN-14_C30_C30_GSFC_SLR.txt
 Dataset distributed by UTCSR
-    ftp://ftp.csr.utexas.edu/pub/slr/degree_2/C20_RL05.txt
+    C20_RL05.txt
 Datasets distributed by GFZ
-    ftp://isdcftp.gfz-potsdam.de/grace/Level-2/GFZ/RL06_SLR_C20/
-        GFZ_RL06_C20_SLR.dat
-    ftp://isdcftp.gfz-potsdam.de/grace/GravIS/GFZ/Level-2B/aux_data/
-        GRAVIS-2B_GFZOP_GRACE+SLR_LOW_DEGREES_0002.dat
+    GFZ_RL06_C20_SLR.dat
+    GRAVIS-2B_GFZOP_GRACE+SLR_LOW_DEGREES_0002.dat
 
 CALLING SEQUENCE:
     SLR_C20 = gravity_toolkit.SLR.C20(SLR_file)

diff --git a/gravity_toolkit/SLR/C30.py b/gravity_toolkit/SLR/C30.py
@@ -6,13 +6,10 @@
 Reads monthly degree 3 zonal spherical harmonic data files from SLR
 
 Dataset distributed by NASA PO.DAAC
-    https://podaac-tools.jpl.nasa.gov/drive/files/GeodeticsGravity/gracefo/docs
-        TN-14_C30_C30_GSFC_SLR.txt
-    ftp://ftp.csr.utexas.edu/pub/slr/degree_5/
-        CSR_Monthly_5x5_Gravity_Harmonics.txt
+    TN-14_C30_C30_GSFC_SLR.txt
+    CSR_Monthly_5x5_Gravity_Harmonics.txt
 Dataset distributed by GFZ
-    ftp://isdcftp.gfz-potsdam.de/grace/GravIS/GFZ/Level-2B/aux_data/
-        GRAVIS-2B_GFZOP_GRACE+SLR_LOW_DEGREES_0002.dat
+    GRAVIS-2B_GFZOP_GRACE+SLR_LOW_DEGREES_0002.dat
 
 CALLING SEQUENCE:
     SLR_C30 = gravity_toolkit.SLR.C30(SLR_file)

diff --git a/gravity_toolkit/geocenter.py b/gravity_toolkit/geocenter.py
@@ -650,8 +650,7 @@ def from_tellus(self, geocenter_file, **kwargs):
         Technical Notes (TN-13) calculated using GRACE/GRACE-FO measurements and
         Ocean Models of Degree 1
 
-        `Datasets distributed by NASA PO.DAAC
-        <https://podaac-tools.jpl.nasa.gov/drive/files/allData/tellus/L2/degree_1>`_
+        Datasets distributed by NASA PO.DAAC
 
         Parameters
         ----------

diff --git a/scripts/aod1b_geocenter.py b/scripts/aod1b_geocenter.py
@@ -12,9 +12,6 @@
 
 Creates monthly files of geocenter variations at 3 or 6 hour intervals
 
-NOTE: this reads the GFZ AOD1B files downloaded from PO.DAAC
-https://podaac-uat.jpl.nasa.gov/drive/files/allData/grace/L1B/GFZ/AOD1B/RL06/
-
 CALLING SEQUENCE:
     python aod1b_geocenter.py --release RL06 --product atm ocn glo oba
 

diff --git a/scripts/aod1b_oblateness.py b/scripts/aod1b_oblateness.py
@@ -12,9 +12,6 @@
 
 Creates monthly files of oblateness (C20) variations at 3 or 6 hour intervals
 
-NOTE: this reads the GFZ AOD1B files downloaded from PO.DAAC
-https://podaac-uat.jpl.nasa.gov/drive/files/allData/grace/L1B/GFZ/AOD1B/RL05/
-
 CALLING SEQUENCE:
     python aod1b_oblateness.py --release RL06 atm ocn glo oba
 

diff --git a/scripts/calc_degree_one.py b/scripts/calc_degree_one.py
@@ -562,10 +562,6 @@ def calc_degree_one(base_dir, PROC, DREL, MODEL, LMAX, RAD,
     atm = gravtk.geocenter().from_harmonics(ATM_Ylms)
 
     # read bottom pressure model if applicable
-    # ECCO_kf080i: https://ecco.jpl.nasa.gov/drive/files/NearRealTime/KalmanFilter/
-    # ECCO_dr080i: https://ecco.jpl.nasa.gov/drive/files/NearRealTime/Smoother/
-    # ECCO_V4r3: https://ecco.jpl.nasa.gov/drive/files/Version4/Release3/interp_monthly/
-    # ECCO_V4r4: https://ecco.jpl.nasa.gov/drive/files/Version4/Release4/interp_monthly/
     if MODEL not in ('OMCT','MPIOM'):
         # read input data files for ascii (txt), netCDF4 (nc) or HDF5 (H5)
         MODEL_INDEX = pathlib.Path(MODEL_INDEX).expanduser().absolute()

diff --git a/scripts/plot_AIS_grid_maps.py b/scripts/plot_AIS_grid_maps.py
@@ -168,6 +168,7 @@ def plot_IMBIE2_basins(ax, base_dir):
     # read drainage basin polylines from shapefile (using splat operator)
     basin_shapefile = base_dir.joinpath(*IMBIE_basin_file)
     logging.debug(str(basin_shapefile))
+    logging.debug(str(basin_shapefile))
     shape_input = shapefile.Reader(str(basin_shapefile))
     shape_entities = shape_input.shapes()
     shape_attributes = shape_input.records()
@@ -191,6 +192,7 @@ def plot_IMBIE2_subbasins(ax, base_dir):
     IMBIE_subbasin_file = ['Basins_20Oct2016_v1.7','Basins_v1.7.shp']
     basin_shapefile = base_dir.joinpath('masks',*IMBIE_subbasin_file)
     logging.debug(str(basin_shapefile))
+    logging.debug(str(basin_shapefile))
     shape_input = shapefile.Reader(str(basin_shapefile))
     shape_entities = shape_input.shapes()
     shape_attributes = shape_input.records()