Commit feb51bf3 authored 2 years ago by Clayton, Brandon Scott

Merge branch 'services' into 'main'

Resolves - Handle Multiple NetCDF Files for AASHTO Service

Closes #60

See merge request !127

parents 29774e06 0d4b9759

No related branches found

No related tags found

Checking pipeline status

Hide whitespace changes

Inline Side-by-side

Showing

src/aashto/src/main/java/gov/usgs/earthquake/nshmp/netcdf/NetcdfDataFilesGroundMotions.java 77 additions, 0 deletions

...earthquake/nshmp/netcdf/NetcdfDataFilesGroundMotions.java
src/aashto/src/main/java/gov/usgs/earthquake/nshmp/netcdf/NetcdfGroundMotions.java 4 additions, 4 deletions

...gov/usgs/earthquake/nshmp/netcdf/NetcdfGroundMotions.java
src/aashto/src/main/java/gov/usgs/earthquake/nshmp/netcdf/data/NetcdfDataGroundMotions.java 29 additions, 0 deletions

...earthquake/nshmp/netcdf/data/NetcdfDataGroundMotions.java
src/aashto/src/main/java/gov/usgs/earthquake/nshmp/netcdf/reader/ReaderGroundMotions.java 8 additions, 0 deletions

...s/earthquake/nshmp/netcdf/reader/ReaderGroundMotions.java
src/aashto/src/main/java/gov/usgs/earthquake/nshmp/netcdf/www/NetcdfController.java 7 additions, 4 deletions

...ov/usgs/earthquake/nshmp/netcdf/www/NetcdfController.java
src/aashto/src/main/java/gov/usgs/earthquake/nshmp/netcdf/www/NetcdfServiceGroundMotions.java 22 additions, 16 deletions

...rthquake/nshmp/netcdf/www/NetcdfServiceGroundMotions.java
src/aashto/src/main/java/gov/usgs/earthquake/nshmp/netcdf/www/SwaggerController.java 10 additions, 55 deletions

...v/usgs/earthquake/nshmp/netcdf/www/SwaggerController.java
src/aashto/src/main/java/gov/usgs/earthquake/nshmp/netcdf/www/SwaggerGroundMotions.java 94 additions, 0 deletions

...sgs/earthquake/nshmp/netcdf/www/SwaggerGroundMotions.java
src/aashto/src/main/resources/aashto-example.nc 0 additions, 0 deletions

src/aashto/src/main/resources/aashto-example.nc
src/aashto/src/main/resources/application.yml 4 additions, 1 deletion

src/aashto/src/main/resources/application.yml
src/hazard/src/main/java/gov/usgs/earthquake/nshmp/netcdf/NetcdfDataFilesHazardCurves.java 49 additions, 0 deletions

.../earthquake/nshmp/netcdf/NetcdfDataFilesHazardCurves.java
src/hazard/src/main/java/gov/usgs/earthquake/nshmp/netcdf/NetcdfHazardCurves.java 1 addition, 1 deletion

.../gov/usgs/earthquake/nshmp/netcdf/NetcdfHazardCurves.java
src/hazard/src/main/java/gov/usgs/earthquake/nshmp/netcdf/data/NetcdfDataHazardCurves.java 4 additions, 64 deletions

.../earthquake/nshmp/netcdf/data/NetcdfDataHazardCurves.java
src/hazard/src/main/java/gov/usgs/earthquake/nshmp/netcdf/reader/ReaderHazardCurves.java 4 additions, 11 deletions

...gs/earthquake/nshmp/netcdf/reader/ReaderHazardCurves.java
src/hazard/src/main/java/gov/usgs/earthquake/nshmp/netcdf/www/HazardMetadata.java 33 additions, 0 deletions

.../gov/usgs/earthquake/nshmp/netcdf/www/HazardMetadata.java
src/hazard/src/main/java/gov/usgs/earthquake/nshmp/netcdf/www/NetcdfController.java 16 additions, 11 deletions

...ov/usgs/earthquake/nshmp/netcdf/www/NetcdfController.java
src/hazard/src/main/java/gov/usgs/earthquake/nshmp/netcdf/www/NetcdfServiceHazardCurves.java 41 additions, 24 deletions

...arthquake/nshmp/netcdf/www/NetcdfServiceHazardCurves.java
src/hazard/src/main/java/gov/usgs/earthquake/nshmp/netcdf/www/RequestHazardCurves.java 41 additions, 0 deletions

...usgs/earthquake/nshmp/netcdf/www/RequestHazardCurves.java
src/hazard/src/main/java/gov/usgs/earthquake/nshmp/netcdf/www/SwaggerController.java 7 additions, 61 deletions

...v/usgs/earthquake/nshmp/netcdf/www/SwaggerController.java
src/hazard/src/main/java/gov/usgs/earthquake/nshmp/netcdf/www/SwaggerHazardCurves.java 108 additions, 0 deletions

...usgs/earthquake/nshmp/netcdf/www/SwaggerHazardCurves.java

with 559 additions and 252 deletions

Please register or to comment