diff --git a/src/main/java/gov/usgs/earthquake/nshmp/netcdf/SiteClass.java b/src/main/java/gov/usgs/earthquake/nshmp/netcdf/SiteClass.java index d6a2d54ad164727e153757a9b8160e3f13109904..96eb4d3cf7060c6e61b1da01a8df9a7567595349 100644 --- a/src/main/java/gov/usgs/earthquake/nshmp/netcdf/SiteClass.java +++ b/src/main/java/gov/usgs/earthquake/nshmp/netcdf/SiteClass.java @@ -5,10 +5,10 @@ import java.util.Arrays; /** * This should be imported. For now, it is copied from * nshmp-haz-v2/src/gov.usgs.earthquake.nshmp.site.NehrpSiteClass.java - * + * * Placeholder enum for likely move to Nehrp site class identifier instead of * Vs30. - * + * * <p>These site class identifiers map to NEHRP site clases, but the intent is * that they can be used more generally for models in other parts of the world * where the GMMs are not necessarily parameterized in terms of vs30 to define @@ -19,24 +19,24 @@ import java.util.Arrays; * are supported (in 2018) across the entire U.S., there have been changes * proposed for balloting by the BSSC to make the Vs30 definitions of site * classes consistent in how they are calculated. - * + * * @author Peter Powers */ public enum SiteClass { /* * Notes on calculation of Vs30 for site class: - * + * * Question: Why is it that the soil shear wave velocity shown in the Unified * Hazard Tool is not equal to the average of the values shown in ASCE 7-10 * table 20.3-1? - * + * * For instance: 259 m/s (Site Class D), from the Unified Hazard Tool, is not * equal to (600 ft/s + 1200 ft/s)/2 * .3048 = 274 m/s - * + * * Answer (Sanaz): we take the geometric mean: sqrt(1200*600)*0.3048 = * 258.6314 , which rounds to 259m/s. - * + * * */ @@ -86,7 +86,7 @@ public enum SiteClass { /** * Returns a {@code SiteClass} associated with the vs30. - * + * * @param vs30 The vs30 of the site class */ public static SiteClass ofValue(int vs30) { diff --git a/src/main/java/gov/usgs/earthquake/nshmp/netcdf/reader/NetcdfUtils.java b/src/main/java/gov/usgs/earthquake/nshmp/netcdf/reader/NetcdfUtils.java index dfd4f874f7117dca03d0f22a3383826bc1d3dd2a..e80215ddba0fdc62d7d4c99e0db323e8a63f0b31 100644 --- a/src/main/java/gov/usgs/earthquake/nshmp/netcdf/reader/NetcdfUtils.java +++ b/src/main/java/gov/usgs/earthquake/nshmp/netcdf/reader/NetcdfUtils.java @@ -23,7 +23,7 @@ public class NetcdfUtils { /** * Creates a border going clockwise of the given longitudes and latitudes. - * + * * @param longitudes The longitudes * @param latitudes The latitudes * @return @@ -53,7 +53,7 @@ public class NetcdfUtils { /** * Returns a {@code double[]} from a netCDF group - * + * * @param group The netCDF group * @param key The key to read from the group * @throws IOException @@ -64,7 +64,7 @@ public class NetcdfUtils { /** * Returns a {@code int[]} from a netCDF group - * + * * @param group The netCDF group * @param key The key to read from the group * @throws IOException @@ -75,7 +75,7 @@ public class NetcdfUtils { /** * Get a 1D array from a netCDF group. - * + * * @param group The netCDF group * @param key The key to read from the group * @param dataType The data type to read @@ -186,8 +186,8 @@ public class NetcdfUtils { /** * Checks bounding hazard maps contain the same: Site classes, IMTs per each * site class, and ground motions per each IMT - * - * + * + * * @param boundingHazards The bounding hazards */ static void checkBoundingHazards( @@ -204,7 +204,7 @@ public class NetcdfUtils { /** * Check whether bounding hazards contain the same: Site classes, IMTs per * each site class, and ground motions per each IMT - * + * * @param a Bounding hazard map A * @param b Bounding hazard map B */ @@ -219,7 +219,7 @@ public class NetcdfUtils { /** * Check whether hazards contain the same: IMTs and ground motions per each * IMT - * + * * @param a Hazard A * @param b Hazard B */ @@ -231,7 +231,7 @@ public class NetcdfUtils { /** * Check that the X values are identical. - * + * * @param a Sequence A * @param b Sequence B */ diff --git a/src/main/java/gov/usgs/earthquake/nshmp/netcdf/swagger/UpdateSwagger.java b/src/main/java/gov/usgs/earthquake/nshmp/netcdf/swagger/UpdateSwagger.java index 9f70441a2e2b89bab4c85ffe6a1dad919b0caec6..8da40c2fd24c09f5a5fc974eb020f87c0a804d6f 100644 --- a/src/main/java/gov/usgs/earthquake/nshmp/netcdf/swagger/UpdateSwagger.java +++ b/src/main/java/gov/usgs/earthquake/nshmp/netcdf/swagger/UpdateSwagger.java @@ -19,7 +19,7 @@ import io.swagger.v3.oas.models.PathItem; /** * Create Swagger files for each model and update context path. - * + * * @author U.S. Geological Survey */ class UpdateSwagger { diff --git a/src/main/java/gov/usgs/earthquake/nshmp/netcdf/www/NetcdfController.java b/src/main/java/gov/usgs/earthquake/nshmp/netcdf/www/NetcdfController.java index b438e8574df7b66dbfcd9b3b951ed4cdd802e748..c5625d1f7b25e9aba44df840bb97f7d5b85c23f9 100644 --- a/src/main/java/gov/usgs/earthquake/nshmp/netcdf/www/NetcdfController.java +++ b/src/main/java/gov/usgs/earthquake/nshmp/netcdf/www/NetcdfController.java @@ -28,9 +28,9 @@ import io.swagger.v3.oas.annotations.tags.Tag; /** * Micronaut controller for getting static hazards for a specific * {@code NshmGroup} from a NetCDF file. - * + * * @see NetcdfService - * + * * @author U.S. Geological Survey */ @Tag(name = "Hazard Data") @@ -48,7 +48,7 @@ public class NetcdfController { /** * GET method to return the usage information on the NetCDF web service. - * + * * @param request The HTTP request */ @Operation( @@ -67,7 +67,7 @@ public class NetcdfController { /** * GET method to return a hazard curve using URL query. - * + * * @param request The HTTP request * @param longitude The longitude of the site * @param latitude Latitude of the site @@ -98,7 +98,7 @@ public class NetcdfController { /** * GET method to return a hazard curve using slash delimited. - * + * * @param request The HTTP request * @param longitude The longitude of the site * @param latitude Latitude of the site @@ -127,7 +127,7 @@ public class NetcdfController { /** * GET method to return hazard curves using slash delimited. - * + * * @param request The HTTP request * @param longitude The longitude of the site * @param latitude Latitude of the site @@ -154,7 +154,7 @@ public class NetcdfController { /** * GET method to return hazard curves using slash delimited. - * + * * @param request The HTTP request * @param longitude The longitude of the site * @param latitude Latitude of the site @@ -179,7 +179,7 @@ public class NetcdfController { /** * Returns the border as a GeoJSON feature collections. - * + * * @param request The HTTP request */ @Operation( @@ -199,7 +199,7 @@ public class NetcdfController { /** * GET method to return the bounding hazards using URL query. - * + * * @param request The HTTP request * @param longitude The longitude * @param latitude The latitude @@ -217,7 +217,7 @@ public class NetcdfController { /** * GET method to return the bounding hazards using slash delimited. - * + * * @param request The HTTP request * @param longitude The longitude * @param latitude The latitude diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml index f7f49d44d2952daea8299b55ab83db65c8952f46..f74e41693090ae1b24cabe0642f4ec814564c4a1 100644 --- a/src/main/resources/logback.xml +++ b/src/main/resources/logback.xml @@ -3,7 +3,7 @@ <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> <withJansi>true</withJansi> - <!-- encoders are assigned the type ch.qos.logback.classic.encoder.PatternLayoutEncoder + <!-- encoders are assigned the type ch.qos.logback.classic.encoder.PatternLayoutEncoder by default --> <encoder> <pattern>%cyan(%d{HH:mm:ss.SSS}) %gray([%thread])