v2.19

Former-commit-id: 2a23e8978236ca946983a72e0b2a4ef5bd565161 [formerly 3f201f6bb84b4f470cec2de64732006774c7bb24] [formerly d5c97dd9617b4e9f3c67f116c7c3a49f7848d979 [formerly 5bc1731aefe28571a3a266f32ec59d7537bb9d6b]]
Former-commit-id: 362e17bd97c204381d6ffa91ededf952333d6e5b [formerly 30efa9fcb6961e5e815badf0fbdfe59e173dd2bd]
Former-commit-id: 4c48a613d5a079fc34b577fb39bb1d71778fd8a9
Former-commit-id: 397a17ce6ce827547d9e965fcf63bc512c2fa456

WEB-INF/classes/com/cohort/util/Math2.java

@@ -93,6 +93,7 @@ public class Math2 {
      * This is one value (not adjusted by total memory or ...), on the theory that 
      * bigger tasks are usually given to computers with more, faster cores and more memory,
      * and smaller tasks are usually given to computers with fewer, slower cores and less memory.
+     * 2022-09-12 On CoastWatch ERDDAP, about 85% of "Pause Full (System.gc())" complete in <=400ms.
      */
     public static int shortSleep = 400; 
 
@@ -410,8 +411,8 @@ public static void incgc(final long millis) {
     }
 
     /** 
-     * This calls gc(standardWaitTime).
-     * standardWaitTime is intended to give gc sufficient time to do its job, even under heavy use.
+     * This calls gc(shortSleep).
+     * shortSleep is intended to give gc sufficient time to do its job, even under heavy use.
      */
     public static void gcAndWait() {
         gc(shortSleep);

WEB-INF/classes/gov/noaa/pfel/coastwatch/TestAll.java

@@ -570,7 +570,7 @@ public static void main(String args[]) throws Throwable {
 //       !!! CLOSE all other windows, even EditPlus.
 //       !!! EMPTY Recycle Bin 
 //       !!! CHANGE "Run TestAll" MEMORY SETTING to 7GB
-//       EDDTableFromNcFiles.bobConsolidateGtsppTgz(2022, 5, 2022,  7, false);  //first/last year(1985..)/month(1..), testMode  1985,02 is first time
+//       EDDTableFromNcFiles.bobConsolidateGtsppTgz(2022, 1, 2022,  8, false);  //first/last year(1985..)/month(1..), testMode  1985,02 is first time
 //       log file is c:/data/gtspp/logYYYYMMDD.txt 
 //      2b) Email the "good" but "impossible" stations to Tim Boyer <[email protected]>,
 //         and "Christopher Paver - NOAA Federal ([email protected])" <[email protected]>
@@ -603,7 +603,7 @@ public static void main(String args[]) throws Throwable {
 //       It takes ~20 seconds per month processed.
 //       It uses a local version of the dataset, not the one in localhost erddap.
 //       !!! CHANGE TestAll MEMORY SETTING to 7GB   //2016-10 is huge//       
-//       EDDTableFromNcFiles.bobCreateGtsppNcCFFiles(2022, 5, 2022,  7); //e.g., first/last year(1985..)/month(1..)
+//       EDDTableFromNcFiles.bobCreateGtsppNcCFFiles(2022, 1, 2022,  8); //e.g., first/last year(1985..)/month(1..)
 //       String2.log(NcHelper.ncdump("/u00/data/points/gtsppNcCF/201406a.nc", "-h"));
 //    8) Run:  (should fail at current calendar month)
 //       EDDTableFromNcFiles.testGtsppabFilesExist(1990, 2022);
@@ -1097,7 +1097,7 @@ public static void main(String args[]) throws Throwable {
         boolean interactive = false;
         boolean doSlowTestsToo = true;
 
-/* for releases, this line should have open/close comment */
+/* for releases, this line should have open/close comment 
 // and all tests should be "0, -1" 
 
         //*** All of the unit tests for CWBrowsers and ERDDAP. 

WEB-INF/classes/gov/noaa/pfel/erddap/dataset/EDDTableFromNcFiles.java

@@ -7289,7 +7289,7 @@ public static void testErdGtsppBest(String tDatasetID) throws Throwable {
 "  }\n" +
 "  station_id {\n" +
 "    Int32 _FillValue 2147483647;\n" +
-"    Int32 actual_range 1, 47293252;\n" +  //changes every month  //don't regex this. It's important to see the changes.
+"    Int32 actual_range 1, 47748546;\n" +  //changes every month  //don't regex this. It's important to see the changes.
 "    String cf_role \"profile_id\";\n" +
 "    String comment \"Identification number of the station (profile) in the GTSPP Continuously Managed Database\";\n" +
 "    String ioos_category \"Identifier\";\n" +
@@ -7334,7 +7334,7 @@ public static void testErdGtsppBest(String tDatasetID) throws Throwable {
 "  }\n" +
 "  time {\n" +
 "    String _CoordinateAxisType \"Time\";\n" +
-"    Float64 actual_range 4.772736e+8, 1.6587489e+9;\n" + //2nd value changes   use + //first value was 4.811229e8 until 2020-07-12
+"    Float64 actual_range 4.772736e+8, 1.6617753e+9;\n" + //2nd value changes   use + //first value was 4.811229e8 until 2020-07-12
 "    String axis \"T\";\n" +
 "    String ioos_category \"Time\";\n" +
 "    String long_name \"Time\";\n" +
@@ -7396,7 +7396,7 @@ public static void testErdGtsppBest(String tDatasetID) throws Throwable {
 " }\n" +
 "  NC_GLOBAL {\n" +  
 "    String acknowledgment \"These data were acquired from the US NOAA National Oceanographic " +
-    "Data Center (NODC) on 2022-08-10 from https://www.nodc.noaa.gov/GTSPP/.\";\n" + //changes monthly
+    "Data Center (NODC) on 2022-09-12 from https://www.nodc.noaa.gov/GTSPP/.\";\n" + //changes monthly
 "    String cdm_altitude_proxy \"depth\";\n" +
 "    String cdm_data_type \"TrajectoryProfile\";\n" +
 "    String cdm_profile_variables \"station_id, longitude, latitude, time\";\n" +
@@ -7424,9 +7424,9 @@ public static void testErdGtsppBest(String tDatasetID) throws Throwable {
 "    String gtspp_handbook_version \"GTSPP Data User's Manual 1.0\";\n" +
 "    String gtspp_program \"writeGTSPPnc40.f90\";\n" +
 "    String gtspp_programVersion \"1.8\";\n" +  
-"    String history \"2022-08-01 csun writeGTSPPnc40.f90 Version 1.8\n" +//date changes
+"    String history \"2022-09-01 csun writeGTSPPnc40.f90 Version 1.8\n" +//date changes
 ".tgz files from ftp.nodc.noaa.gov /pub/data.nodc/gtspp/bestcopy/netcdf (https://www.nodc.noaa.gov/GTSPP/)\n" +
-"2022-08-10 Most recent ingest, clean, and reformat at ERD (erd.data at noaa.gov).\n"; //date changes
+"2022-09-12 Most recent ingest, clean, and reformat at ERD (erd.data at noaa.gov).\n"; //date changes
 
         po = results.indexOf("erd.data at noaa.gov).\n");
         Test.ensureTrue(po > 0, "\nresults=\n" + results);
@@ -7444,7 +7444,7 @@ public static void testErdGtsppBest(String tDatasetID) throws Throwable {
 "    String keywords_vocabulary \"NODC Data Types, CF Standard Names, GCMD Science Keywords\";\n" +
 "    String LEXICON \"NODC_GTSPP\";\n" +                                      //date below changes
 "    String license \"These data are openly available to the public.  Please acknowledge the use of these data with:\n" +
-"These data were acquired from the US NOAA National Oceanographic Data Center (NODC) on 2022-08-10 from https://www.nodc.noaa.gov/GTSPP/.\n" +
+"These data were acquired from the US NOAA National Oceanographic Data Center (NODC) on 2022-09-12 from https://www.nodc.noaa.gov/GTSPP/.\n" +
 "\n" +
 "The data may be used and redistributed for free but is not intended\n" +
 "for legal use, since it may contain inaccuracies. Neither the data\n" +
@@ -7469,7 +7469,7 @@ public static void testErdGtsppBest(String tDatasetID) throws Throwable {
 "Requesting data for a specific station_id may be slow, but it works.\n" +
 "\n" +                       
 "*** This ERDDAP dataset has data for the entire world for all available times (currently, " +
-    "up to and including the July 2022 data) but is a subset of the " + //month changes
+    "up to and including the August 2022 data) but is a subset of the " + //month changes
     "original NODC 'best-copy' data.  It only includes data where the quality flags indicate the data is 1=CORRECT, 2=PROBABLY GOOD, or 5=MODIFIED. It does not include some of the metadata, any of the history data, or any of the quality flag data of the original dataset. You can always get the complete, up-to-date dataset (and additional, near-real-time data) from the source: https://www.nodc.noaa.gov/GTSPP/ .  Specific differences are:\n" +
 "* Profiles with a position_quality_flag or a time_quality_flag other than 1|2|5 were removed.\n" +
 "* Rows with a depth (z) value less than -0.4 or greater than 10000 or a z_variable_quality_flag other than 1|2|5 were removed.\n" +
@@ -7482,7 +7482,7 @@ public static void testErdGtsppBest(String tDatasetID) throws Throwable {
 "The Quality Flag definitions are also at\n" +
 "https://www.nodc.noaa.gov/GTSPP/document/qcmans/qcflags.htm .\";\n" +
 "    String testOutOfDate \"now-45days\";\n" +
-"    String time_coverage_end \"2022-07-25T11:35:00Z\";\n" + //changes
+"    String time_coverage_end \"2022-08-29T12:15:00Z\";\n" + //changes
 "    String time_coverage_start \"1985-02-15T00:00:00Z\";\n" + //was 1985-03-31T13:15:00Z before 2020-07-12  the new time is such a round number!
 "    String title \"Global Temperature and Salinity Profile Programme (GTSPP) Data, 1985-present\";\n" +
 "    Float64 Westernmost_Easting -180.0;\n" +

download/SearchMultipleERDDAPs.html

@@ -31,7 +31,7 @@
     "https://erddap.secoora.org/erddap/",
     "https://ecowatch.ncddc.noaa.gov/erddap/",
     "http://osmc.noaa.gov/erddap/",
-    "https://coastwatch.noaa.gov/erddap/",
+    "https://coastwatch.noaa.gov//erddap/",
     "http://dap.onc.uvic.ca/erddap/",
     "https://oceanwatch.pifsc.noaa.gov/erddap/",
     "https://erddap-goldcopy.dataexplorer.oceanobservatories.org/erddap/",

download/changes.html

@@ -111,12 +111,16 @@ <h2><a class="selfLink" id="changes2.19" href="#changes2.19" rel="bookmark">Chan
       src="../images/external.png" alt=" (external link)" 
       title="This link to an external website does not constitute an endorsement."></a>     
     to check resource usage and consider giving ERDDAP more resources.
+    Memory is cheap! Most phones have more processors and memory than 
+    the servers that some of you are using to run ERDDAP!
     Thanks to Erin Turnbull.
     <br>&nbsp;
   <li>TO DO: If you use ERDDAP to access Cassandra, for Cassandra, you need to keep using the version
     of Java that you were using for running the Cassandra. 
     Just switch to Java 17 for running Tomcat+ERDDAP. 
-  <li>TO DO: Recommended: If your server's CPU has 4+ cores, consider changing to these settings in your datasets.xml file:<kbd>
+    <br>&nbsp;
+  <li>TO DO: Recommended: If your server's CPU has 4+ cores and 8+ GB of RAM, 
+     consider changing to these settings in your datasets.xml file:<kbd>
       <br>&nbsp;&nbsp;&lt;nGridThreads&gt;3&lt;/nGridThreads&gt;     
       <br>&nbsp;&nbsp;&lt;nTableThreads&gt;3&lt;/nTableThreads&gt;   </kbd>
     <br>The nThreads systems for EDDGridFromFiles and EDDTableFromFiles were significantly improved. 
@@ -125,6 +129,10 @@ <h2><a class="selfLink" id="changes2.19" href="#changes2.19" rel="bookmark">Chan
     Some related changes from Chris John will also lead to a general speedup throughout ERDDAP.
     The code for these changes was contributed by Chris John. Thank you, Chris!
     <br>&nbsp;
+  <li>WARNING: hyphens in datasetID's are deprecated and no longer supported (although technically still allowed).
+    They will probably be disallowed in the next release. 
+    If you use hyphens, switch to underscores now to avoid trouble.
+    <br>&nbsp;
   <li>NEW: Now, for .htmlTable data responses, 
     if the data in a String cell contains <kbd>data:image/png;base64,</kbd> followed by a base64 encoded .png image,
     ERDDAP will display an icon (so the user can see the image if they hover over it)