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.

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

incomplete fix to update postproc diff names #62

Merged
merged 9 commits into from
Apr 17, 2021
Merged

Conversation

kirenbahm
Copy link
Owner

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.

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.
@kirenbahm kirenbahm linked an issue Mar 2, 2021 that may be closed by this pull request
@LAGO-Support
Copy link
Contributor

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
Copy link
Owner Author

kirenbahm commented Mar 5, 2021 via email

Added change to Monthly, Calendar Year,  and Water year to match Wet Dry Season change
Copy link
Contributor

@LAGO-Support LAGO-Support left a comment

Choose a reason for hiding this comment

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

Caught one edit to be made. You had the change for difference maps and had the change for the folder name for Wet Dry Season but had the old name for the Calendar year, monthly, and water year folders

@kirenbahm
Copy link
Owner Author

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 

LAGO-Support and others added 7 commits March 17, 2021 17:17
Code was using AnalysisCompare output file naming conventions to find GenerateComputedMatlab outputs (The Statistic Calculations). This adjustment will use the correct name to find the statistic dfs0 files, and the new naming convention for the A11 script outputs.
made error message correctly reference.
Added comments that explain the user inputs for alternatives, and gives
examples. Hopefully this will clarify some of the naming conventions
used in the output of these scripts.
These fixes will pass the correct file names and directories to be used in createStatsiticFigure using correct file naming conventions.
These adjustments will correctly parse the "legend entry" to use as file name as well as in plot titles and Latex entries.
Call Alternative name for statistic dfs2 files
@kirenbahm
Copy link
Owner Author

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:

  1. 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.

  2. Rename files in new directory from M06_test to M06_test2

  3. 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'];
  1. 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?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Fix labeling on postproc spatial maps
2 participants