Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add 13 scenarios apr2023 #82

Merged
merged 7 commits into from
Aug 10, 2023
Merged

Add 13 scenarios apr2023 #82

merged 7 commits into from
Aug 10, 2023

Conversation

wkhchow
Copy link
Collaborator

@wkhchow wkhchow commented Jul 20, 2023

Can we merge this into master now so we can generate the release assets?
Or are we still missing something before we can merge?
Looking to get the release asset for the new geopackages so I can attach them onto the FGP records.

@anthonyfok
Add 13 new scenarios by Jeremy Rimando (original unrenamed files)
33bfea3 
In subsequent commits, the scenarios will be renamed as follows:

    ACM5p2_Abbotsford            → ACM5p2_VedderFault
    ACM5p0_Burnaby               → ACM5p0_MysteryLake
    ACM5p7_Ladysmith             → ACM5p7_SoutheyPoint
    ACM4p9_MatsquiMain2          → ACM4p9_VedderFault
    SCM5p9_Montreal              → SCM5p9_MillesIlesFault
    SCM5p6_Ottawa                → SCM5p6_GloucesterFault
    ACM5p2_PortAlberni           → ACM5p2_BeaufortFault
    ACM7p7_QueenCharlotte        → ACM7p7_QueenCharlotteFault
    ACM5p0_Richmond              → ACM5p0_GeorgiaStraitFault
    ACM8p0_SkeenaQueenCharlotteE → ACM8p0_QueenCharlotteFault
    SCM5p0_Toronto_BTSZ          → SCM5p0_BurlingtonTorontoStructuralZone
    SCM5p0_Toronto_CMMBZ         → SCM5p0_RougeBeach
    ACM5p5_Tsussie6              → ACM5p5_SoutheyPoint
@anthonyfok
Rename the 13 newly added scenarios by Jeremy as per Tiegan’s review
77f862c 
The 13 DSRA scenarios designed by Jeremy Rimando are renamed as per
review by Tiegan E. Hobbs as follows:

    ACM5p2_Abbotsford            → ACM5p2_VedderFault
    ACM5p0_Burnaby               → ACM5p0_MysteryLake
    ACM5p7_Ladysmith             → ACM5p7_SoutheyPoint
    ACM4p9_MatsquiMain2          → ACM4p9_VedderFault
    SCM5p9_Montreal              → SCM5p9_MillesIlesFault
    SCM5p6_Ottawa                → SCM5p6_GloucesterFault
    ACM5p2_PortAlberni           → ACM5p2_BeaufortFault
    ACM7p7_QueenCharlotte        → ACM7p7_QueenCharlotteFault
    ACM5p0_Richmond              → ACM5p0_GeorgiaStraitFault
    ACM8p0_SkeenaQueenCharlotteE → ACM8p0_QueenCharlotteFault
    SCM5p0_Toronto_BTSZ          → SCM5p0_BurlingtonTorontoStructuralZone
    SCM5p0_Toronto_CMMBZ         → SCM5p0_RougeBeach
    ACM5p5_Tsussie6              → ACM5p5_SoutheyPoint

Please refer to the internal ScenarioReview_TH_Oct2022.xlsx (last updated
2023-02-22) for details.
@anthonyfok
Add missing OQ run number to ACM7p7_QueenCharlotteFault ShakeMap CSV
ea12e07 
Rename
    s_shakemap_ACM7p7_QueenCharlotteFault.csv
to
    s_shakemap_ACM7p7_QueenCharlotteFault_1.csv

with the added OpenQuake run #1 for consistency with other ShakeMap CSV
files to hopefully resolve the following error during stack build:

    [add_data.sh:737:import_shakemap] RUN: python3 DSRA_runCreateTableShakemap.py --shakemapFile=s_shakemap_ACM7p7_QueenCharlotteFault.csv
    2023-04-05 00:13:34,991 - ERROR - cross-database references are not implemented: "gmf.shakemap_acm7p7_queencharlottefault.csv"

    \copy: parse error at "."
    copy gmf.shakemap_ACM7p7_QueenCharlotteFault.csv (site_id,gmv_PGA,"gmv_SA(0.1)","gmv_SA(0.2)","gmv_SA(0.3)","gmv_SA(0.5)","gmv_SA(0.6)","gmv_SA(1.0)","gmv_SA(2.0)",lon,lat) FROM /usr/src/app/s_shakemap_ACM7p7_QueenCharlotteFault.csv WITH CSV HEADER ;

The OpenQuake run number was obtained from the logo file
s_Hazard_ACM7p7_QueenCharlotte_syst.log in the directory
outputs/Systematic/Queen Charlotte-Systematic/ACM7p7_QueenCharlotte_syst
in the OpenDRR/earthquake-scenarios-2022-jrimando-google-drive repo.

Thanks to William Chow (@wkhchow) for discovering the error and catching
the missing OQ run number!
@anthonyfok
Generate PNG and Markdown files for the 13 new scenarios
2e23057 
Create a quick-and-dirty scripts/run-TakeSnapshot.sh script to call
scripts/TakeSnapshot.py to generate PNG map and Markdown summary files
for the 13 new scenarios:

    ACM5p2_VedderFault
    ACM5p0_MysteryLake
    ACM5p7_SoutheyPoint
    ACM4p9_VedderFault
    SCM5p9_MillesIlesFault
    SCM5p6_GloucesterFault
    ACM5p2_BeaufortFault
    ACM7p7_QueenCharlotteFault
    ACM5p0_GeorgiaStraitFault
    ACM8p0_QueenCharlotteFault
    SCM5p0_BurlingtonTorontoStructuralZone
    SCM5p0_RougeBeach
    ACM5p5_SoutheyPoint
@anthonyfok
Upload GeoPackage files for the 13 new scenarios
ae79c1e 
Part of the series of commits for adding the following 13 scenarios:

    ACM5p2_VedderFault
    ACM5p0_MysteryLake
    ACM5p7_SoutheyPoint
    ACM4p9_VedderFault
    SCM5p9_MillesIlesFault
    SCM5p6_GloucesterFault
    ACM5p2_BeaufortFault
    ACM7p7_QueenCharlotteFault
    ACM5p0_GeorgiaStraitFault
    ACM8p0_QueenCharlotteFault
    SCM5p0_BurlingtonTorontoStructuralZone
    SCM5p0_RougeBeach
    ACM5p5_SoutheyPoint

shakemap_scenario_extents.zip is also updated accordingly.

Special thanks to William Chow (@wkhchow) for generating these
GeoPackage files!
@wkhchow wkhchow added Enhancement New feature or request Priority: Must Have labels Jul 20, 2023
@wkhchow wkhchow requested a review from anthonyfok July 20, 2023 18:12
@wkhchow wkhchow added this to In progress in Data via automation Jul 20, 2023
@anthonyfok anthonyfok linked an issue Aug 3, 2023 that may be closed by this pull request
Create PR for branch add-13-scenarios-apr2023 #81
Closed
@anthonyfok
Run ../scripts/finishedMap.sh for the 13 new scenarios
80b1eb2 
This updates FinishedScenarios{,Fr}.geojson,
FinishedScenarios.md and scenarios.csv files.

(Ran on 2023-04-21)
@anthonyfok
Update docs/_data/dsra.yml for the 13 new scenarios
8bd4f46 
Thanks to Will for getting the titles and descriptions professionally
translated into French by our French-speaking translators!
anthonyfok
anthonyfok approved these changes Aug 10, 2023
View reviewed changes
Copy link
Member

@anthonyfok anthonyfok left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry for taking so long to respond.
Looks good to me! Let's merge this! (I wonder if I could do it now, haha!)

There is still the last bit about interactive maps for the new scenarios that I didn't complete (sorry!) but I'd better not delay this any longer. I hope to be able to get this completed before the weekend and maybe tag another minor release for that? <grin, duck, run>...

@anthonyfok anthonyfok merged commit bdb5170 into master Aug 10, 2023
1 check passed
Data automation moved this from In progress to Published Aug 10, 2023
anthonyfok added a commit to anthonyfok/riskprofiler that referenced this pull request Mar 25, 2024
@anthonyfok
Update database to 2024-03-25 with 13 new scenarios
87f92d5 
Thanks to William Chow (@wkhchow) for adding the new scenarios!
See OpenDRR/earthquake-scenarios#82

Also incorporate fixes to the "Liens rapides" on the French landing
page, see OpenDRR#119
anthonyfok added a commit to anthonyfok/riskprofiler that referenced this pull request Mar 27, 2024
@anthonyfok
Update database to 2024-03-25 with 13 new scenarios
35f763e 
Thanks to William Chow (@wkhchow) for adding the new scenarios!
See OpenDRR/earthquake-scenarios#82

Also incorporate fixes to the "Liens rapides" on the French landing
page, see OpenDRR#119
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@anthonyfok anthonyfok anthonyfok approved these changes

Assignees

@anthonyfok anthonyfok

@wkhchow wkhchow

Labels
Enhancement New feature or request Priority: Must Have
Projects
Data
Published
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Create PR for branch add-13-scenarios-apr2023
2 participants
@wkhchow @anthonyfok