Merge tiegan-working branch into master #92
Conversation
|
Hey @anthonyfok do we still need to approve this or has it been superceded? |
|
Sorry @tieganh missed this PR from August 2022! Also we would need to file a issue to fix for a new revision of opendrr/model-factory as I suspect the change in chazard/cdamage to have beta suffix would need to change some parts of the psra ingest @drotheram. |
Hey @tieganh, we still need this PR to be merged eventually. It is not superceded, but there are some merge conflicts which I'll try to resolve tomorrow or early next week. |
|
Hey Anthony - I've added you as a moderator of that repo. Thanks!
From: Anthony Fok ***@***.***>
Sent: Thursday, May 11, 2023 2:52 PM
To: OpenDRR/seismic-risk-model ***@***.***>
Cc: Tiegan Hobbs ***@***.***>; Mention ***@***.***>
Subject: Re: [OpenDRR/seismic-risk-model] Merge tiegan-working branch into master (PR #92)
***Caution - email originated from outside of NRCan. Read the warning below / Attention- Ce courriel provient de l'extérieur des RNCan. Voir la mise en garde ci-dessous***
Hey @anthonyfok<https://github.com/anthonyfok> do we still need to approve this or has it been superceded?
Hey @tieganh<https://github.com/tieganh>, we still need this PR to be merged eventually. It is not superceded, but there are some merge conflicts which I'll try to resolve tomorrow or early next week. I don't yet have write access to this repo though, so I am unable to push merge conflict fixes or to merge the PR. Could you please grant me write access to this repo when you have a chance? Many thanks!
-
Reply to this email directly, view it on GitHub<#92 (comment)>, or unsubscribe<https://github.com/notifications/unsubscribe-auth/AOHGWE3SRMYHDTFB5ZY67YTXFVNPXANCNFSM6AAAAAAQBRISTA>.
You are receiving this because you were mentioned.Message ID: ***@***.***>
This email originated from outside of NRCan. Do not click links or open attachments unless you recognize the sender and believe the content is safe. For more information, please visit How to Identify Phishing<https://intranet.nrcan.gc.ca/services-policies/dont-get-scammed-cyber-security-101> emails on the NRCan Intranet.
Ce courriel provient de l'extérieur des RNCan. Ne cliquez pas sur les liens et n'ouvrez pas les pièces jointes, à moins de connaître l'expéditeur et croire que le contenu est sécuritaire. Pour de plus amples renseignements, veuillez consulter Comment identifier des courriels d'hameçonnages<https://intranet.nrcan.gc.ca/services-policies/dont-get-scammed-cyber-security-101> dans l'intranet des RNCan.
|
anthonyfok
force-pushed
the
tiegan-working
branch
from
9eafd97
to
56b0957
Compare
See commit 8b3be4f The French text was translated with DeepL.com with minor manual editing such as changing " " to « », and using non-breaking space where necessary.
There was a problem hiding this comment.
This branch / pull-request has been rebased on top of "master" with merge conflicts resolved.
@tieganh, I took the liberty of changing the date in the README.md file from "11 Aug 2021" to "11 Aug 2022", and to keep what you wrote on 15 Oct 2022 in there too. Please feel free to make further changes if you like in a new pull request.
As part of the OpenDRR/seismic-risk-model publication cleanup originally intended for v1.0.0 release but was overlooked in 2022, sourceTypes.csv was moved to scripts/sourceTypes.csv on 2023-05-29 on master branch, making into v1.1.0 release on 2023-09-12. See OpenDRR/seismic-risk-model#92
Handle the cHazard → cHazard_beta (as well as cDamage → cDamage_beta even if disabled) rename in OpenDRR/seismic-risk-model since 2023-05-29 (master) and 2023-09-12 (v1.1.0); see OpenDRR/seismic-risk-model#92 Fixes #245
As part of the OpenDRR/seismic-risk-model publication cleanup originally intended for v1.0.0 release but was overlooked in 2022, sourceTypes.csv was moved to scripts/sourceTypes.csv on 2023-05-29 on master branch, making into v1.1.0 release on 2023-09-12. See OpenDRR/seismic-risk-model#92
Handle the cHazard → cHazard_beta (as well as cDamage → cDamage_beta even if disabled) rename in OpenDRR/seismic-risk-model since 2023-05-29 (master) and 2023-09-12 (v1.1.0); see OpenDRR/seismic-risk-model#92 Fixes #245
Mostly tidying up of the repository in preparation for public release, and some work on sensitivity testing and risk disaggregation functions over summer 2022.
There should be nothing in here that affects others work, to my knowledge. Will be making a new release from master once this branch is merged, which will be the official first public release.