incomplete fix to update postproc diff names

kirenbahm commented 3 years ago

This is a stash of code that only partially works. The goal was to update the naming for the postproc diff maps so that the names used the simulation label instead of a name derived from the simulation filename.

UPDATE - I think this fix fully addresses the problem, and fully works.

LAGO-Support commented 3 years ago

I agree with your review and assessment that the issue seems to be fixed with your edits.

I believe you can merge the branch with the master at this point.

kirenbahm commented 3 years ago

Thank you

From: LAGO Support notifications@github.com Sent: Friday, March 5, 2021 4:59 PM To: kirenbahm/ENP_TOOLS ENP_TOOLS@noreply.github.com Cc: Bahm, Kiren E Kiren_Bahm@nps.gov; Author author@noreply.github.com Subject: [EXTERNAL] Re: [kirenbahm/ENP_TOOLS] incomplete fix to update postproc diff names (#62)

This email has been received from outside of DOI - Use caution before clicking on links, opening attachments, or responding.

I agree with your review and assessment that the issue seems to be fixed with your edits.

I believe you can merge the branch with the master at this point.

— You are receiving this because you authored the thread. Reply to this email directly, view it on GitHubhttps://gcc02.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fkirenbahm%2FENP_TOOLS%2Fpull%2F62%23issuecomment-791737680&data=04%7C01%7Ckiren_bahm%40nps.gov%7C1887dbbe31104a9b218708d8e02214f8%7C0693b5ba4b184d7b9341f32f400a5494%7C0%7C0%7C637505784278181365%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=DTKWM2GH6yYF300lbwvzWCkIk%2FlP5L5eh3y00nNfpOg%3D&reserved=0, or unsubscribehttps://gcc02.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fnotifications%2Funsubscribe-auth%2FAEJXBGPWIQA7TL6OJYLCWBTTCFH43ANCNFSM4YPBOJQQ&data=04%7C01%7Ckiren_bahm%40nps.gov%7C1887dbbe31104a9b218708d8e02214f8%7C0693b5ba4b184d7b9341f32f400a5494%7C0%7C0%7C637505784278181365%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=6t3uj2faEIaXkqnx0kBOfjrGGXwDb6CevFOLviW%2FWMk%3D&reserved=0.

kirenbahm commented 3 years ago

Here is the output I get for commit 4bcc168. Notice all the file not found messages. Let me know if you get the same thing. If so, please fix.

------------------------------------
Beginning A11_Generate_Statistic_Graphics    (16-Mar-2021 15:16:21)
------------------------------------

Generating ColorMaps

Finding .dfs2 Files For Model M01_test
....Opening file M01_CalYearStats.dfs2
....M01_CalYearStats.dfs2 file not found. skipping 
....Opening file M01_WaterYearStats.dfs2
....M01_WaterYearStats.dfs2 file not found. skipping 
....Opening file M01_WetDryStats.dfs2
....M01_WetDryStats.dfs2 file not found. skipping 
....Opening file M01_TotalAnalysisPeriodStats(1_1999_12_2010).dfs2
....M01_TotalAnalysisPeriodStats(1_1999_12_2010).dfs2 file not found. skipping 
Finding .dfs2 Files For Model M06_test
....Opening file M06_CalYearStats.dfs2
....M06_CalYearStats.dfs2 file not found. skipping 
....Opening file M06_WaterYearStats.dfs2
....M06_WaterYearStats.dfs2 file not found. skipping 
....Opening file M06_WetDryStats.dfs2
....M06_WetDryStats.dfs2 file not found. skipping 
....Opening file M06_TotalAnalysisPeriodStats(1_1999_12_2010).dfs2
....M06_TotalAnalysisPeriodStats(1_1999_12_2010).dfs2 file not found. skipping

kirenbahm commented 3 years ago

I'm still having problems with this. It runs all the way through now. Yay! But... When I ask it to do 3 alternatives, I am not getting all the diff maps.

To recreate the issue:

Copy folder ENP_FILES\ENP_TOOLS_Sample_Input\Result\M06_test.she - Result Files to ENP_FILES\ENP_TOOLS_Sample_Input\Result\M06_test2.she - Result Files.
Rename files in new directory from M06_test to M06_test2

Run generateComputedMatlab.m with:

i = i + 1;  INI.MODEL_SIMULATION_SET{i} = ['..\..\ENP_FILES\ENP_TOOLS_Sample_Input\Result\', 'M01','_', 'test'];
i = i + 1;  INI.MODEL_SIMULATION_SET{i} = ['..\..\ENP_FILES\ENP_TOOLS_Sample_Input\Result\', 'M06','_', 'test'];
i = i + 1;  INI.MODEL_SIMULATION_SET{i} = ['..\..\ENP_FILES\ENP_TOOLS_Sample_Input\Result\', 'M06','_', 'test2'];

Run ANALYSIS_COMPARE.m with:

i = i + 1;  INI.MODEL_SIMULATION_SET{i} = {INI.DATA_COMPUTED, 'M01_test', 'M01'};
i = i + 1;  INI.MODEL_SIMULATION_SET{i} = {INI.DATA_COMPUTED, 'M06_test', 'M06'};
i = i + 1;  INI.MODEL_SIMULATION_SET{i} = {INI.DATA_COMPUTED, 'M06_test2', 'M06-2'};

I am expecting to see two sets of difference maps: M01 minus M06 and M01 minus M06-2. I only see the second set, however.

Can you debug and fix?

kirenbahm / ENP_TOOLS

incomplete fix to update postproc diff names #62