search

schism-dev / schism

Semi-implicit Cross-scale Hydroscience Integrated System Model (SCHISM)
http://ccrm.vims.edu/schismweb/
Apache License 2.0
93 stars 88 forks source link

NEMS build #32

Closed ghost closed 3 years ago

ghost commented 3 years ago

changes made by @pvelissariou1

ghost commented 3 years ago

Hi Zach: It seems all changes in those 8 files should be rejected b/c they are older than master. I noticed your branch feature/nems has incorporated new changes (good). Let me know if my understanding is correct. Thx. @josephzhang8

Yes, it appears that merging backward sifted out the older changes. I am unsure if these specific changes in the 8 files that remain are relevant, or should be rejected. @pvelissariou1 could you go through these and see which need to be kept?

I will test the build with both these changes and with master

josephzhang8 commented 3 years ago

I'm 99% sure they should be rejected, as none of them have anything to do with NEMS.

-Joseph

Y. Joseph Zhang Web: schism.wiki Office: 804 684 7466

From: Zachary Burnett @.> Sent: Friday, June 4, 2021 12:33 PM To: schism-dev/schism @.> Cc: Subscribed @.***> Subject: Re: [schism-dev/schism] NEMS build (#32)

[EXTERNAL to VIMS received message]

Hi Zach: It seems all changes in those 8 files should be rejected b/c they are older than master. I noticed your branch feature/nems has incorporated new changes (good). Let me know if my understanding is correct. Thx.

Yes, it appears that merging backward sifted out the older changes. I am unsure if these specific changes in the 8 files that remain are relevant, or should be rejected. @pvelissariou1https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fpvelissariou1&data=04%7C01%7Cyjzhang%40vims.edu%7C4b791b4c37b947dcb65808d927765a96%7C8cbcddd9588d4e3b9c1e2367dbdf1740%7C0%7C0%7C637584211543843354%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=zMKHFjYqmxHq4LI56BRmegrAuDFfkXKlLJSUoKXXZ80%3D&reserved=0 could you go through these and see which need to be kept?

I will test the build with both these changes and with master

- You are receiving this because you are subscribed to this thread. Reply to this email directly, view it on GitHubhttps://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fschism-dev%2Fschism%2Fpull%2F32%23issuecomment-854860407&data=04%7C01%7Cyjzhang%40vims.edu%7C4b791b4c37b947dcb65808d927765a96%7C8cbcddd9588d4e3b9c1e2367dbdf1740%7C0%7C0%7C637584211543843354%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=4uUveDSA2SkFrxeUyU%2B6AcxpFDFPJe%2FpOrz2VEpNmkI%3D&reserved=0, or unsubscribehttps://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fnotifications%2Funsubscribe-auth%2FAFBKNZ76QM65MEXYEJHYNVDTRD5Z7ANCNFSM46DDSRRA&data=04%7C01%7Cyjzhang%40vims.edu%7C4b791b4c37b947dcb65808d927765a96%7C8cbcddd9588d4e3b9c1e2367dbdf1740%7C0%7C0%7C637584211543853311%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=BTohnUcU5cNwNJBxLaxjRo6cP0KJaEI2ve7unTnygps%3D&reserved=0.

ghost commented 3 years ago

rejecting this PR because of outdated changes