-
Notifications
You must be signed in to change notification settings - Fork 15
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
Make TC Analysis parallel #631
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
13 changes: 6 additions & 7 deletions
13
tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_chrysalis.cfg
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,35 +1,34 @@ | ||
| [default] | ||
| case = "v3.LR.historical_0051" | ||
| case = "v2.LR.historical_0201" | ||
| constraint = "" | ||
| dry_run = "False" | ||
| environment_commands = "" | ||
| input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/v3.LR.historical_0051 | ||
| input = /lcrc/group/e3sm/ac.forsyth2//E3SMv2/v2.LR.historical_0201 | ||
| input_subdir = archive/atm/hist | ||
| mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" | ||
| output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_output/unique_id/v3.LR.historical_0051" | ||
| output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_output/unique_id/v2.LR.historical_0201" | ||
| partition = "debug" | ||
| qos = "regular" | ||
| www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_www/unique_id" | ||
| years = "1985:1987:2", | ||
|
|
||
| [tc_analysis] | ||
| active = True | ||
| scratch = "/lcrc/globalscratch/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_scratch/unique_id/v3.LR.historical_0051" | ||
| scratch = "/lcrc/globalscratch/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_scratch/unique_id/v2.LR.historical_0201" | ||
| walltime = "00:30:00" | ||
|
|
||
| [e3sm_diags] | ||
| active = True | ||
| environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_1003" | ||
| environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_20241015" | ||
| grid = '180x360_aave' | ||
| multiprocessing = True | ||
| num_workers = 8 | ||
| partition = "compute" | ||
| qos = "regular" | ||
| short_name = "v3.LR.historical_0051" | ||
| short_name = "v2.LR.historical_0201" | ||
| ts_num_years = 2 | ||
| walltime = "5:00:00" | ||
|
|
||
| [[ atm_monthly_180x360_aave_tc_analysis ]] | ||
| # Note: tc_analysis requires e3sm_diags jobs to run sequentially | ||
| sets = "tc_analysis", | ||
| # tc_obs is determined automatically |
8 changes: 4 additions & 4 deletions
8
tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_mvm_1_chrysalis.cfg
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,18 +1,18 @@ | ||
| [default] | ||
| case = "v3.LR.historical_0051" | ||
| case = "v2.LR.historical_0201" | ||
| constraint = "" | ||
| dry_run = "False" | ||
| environment_commands = "" | ||
| input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/v3.LR.historical_0051 | ||
| input = /lcrc/group/e3sm/ac.forsyth2//E3SMv2/v2.LR.historical_0201 | ||
| input_subdir = archive/atm/hist | ||
| mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" | ||
| output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_1_output/unique_id/v3.LR.historical_0051" | ||
| output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_1_output/unique_id/v2.LR.historical_0201" | ||
| partition = "debug" | ||
| qos = "regular" | ||
| www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_2_www/unique_id" | ||
| years = "1985:1987:2", | ||
|
|
||
| [tc_analysis] | ||
| active = True | ||
| scratch = "/lcrc/globalscratch/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_1_scratch/unique_id/v3.LR.historical_0051" | ||
| scratch = "/lcrc/globalscratch/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_1_scratch/unique_id/v2.LR.historical_0201" | ||
| walltime = "00:30:00" |
19 changes: 10 additions & 9 deletions
19
tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_mvm_2_chrysalis.cfg
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,47 +1,48 @@ | ||
| # Run this after _1 completes. (We need tc_analysis for the reference years). | ||
| [default] | ||
| case = "v3.LR.historical_0051" | ||
| case = "v2.LR.historical_0201" | ||
| constraint = "" | ||
| dry_run = "False" | ||
| environment_commands = "" | ||
| input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/v3.LR.historical_0051 | ||
| input = /lcrc/group/e3sm/ac.forsyth2//E3SMv2/v2.LR.historical_0201 | ||
| input_subdir = archive/atm/hist | ||
| mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" | ||
| output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_2_output/unique_id/v3.LR.historical_0051" | ||
| output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_2_output/unique_id/v2.LR.historical_0201" | ||
| partition = "debug" | ||
| qos = "regular" | ||
| www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_2_www/unique_id" | ||
| years = "1995:1997:2", | ||
|
|
||
| [tc_analysis] | ||
| active = True | ||
| scratch = "/lcrc/globalscratch/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_2_scratch/unique_id/v3.LR.historical_0051" | ||
| scratch = "/lcrc/globalscratch/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_2_scratch/unique_id/v2.LR.historical_0201" | ||
| walltime = "00:30:00" | ||
|
|
||
| [e3sm_diags] | ||
| active = True | ||
| environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_1003" | ||
| environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_20241015" | ||
| grid = '180x360_aave' | ||
| multiprocessing = True | ||
| num_workers = 8 | ||
| partition = "compute" | ||
| qos = "regular" | ||
| short_name = "v3.LR.historical_0051" | ||
| short_name = "v2.LR.historical_0201" | ||
| walltime = "5:00:00" | ||
|
|
||
| [[ atm_monthly_180x360_aave_mvm ]] | ||
| # Test model-vs-model using the same files as the reference | ||
| climo_subsection = "atm_monthly_180x360_aave" | ||
| diff_title = "Difference" | ||
| ref_final_yr = 1986 | ||
| ref_name = "v3.LR.historical_0051" | ||
| ref_name = "v2.LR.historical_0201" | ||
| ref_start_yr = 1985 | ||
| ref_years = "1985-1986", | ||
| # Use _1 as reference | ||
| reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_1_output/unique_id/v3.LR.historical_0051/post/atm/180x360_aave/clim" | ||
| reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_1_output/unique_id/v2.LR.historical_0201/post/atm/180x360_aave/clim" | ||
| # reference_data_path_tc determined automatically | ||
| run_type = "model_vs_model" | ||
| sets = "tc_analysis", | ||
| short_ref_name = "v3.LR.historical_0051" | ||
| short_ref_name = "v2.LR.historical_0201" | ||
| swap_test_ref = False | ||
| tag = "model_vs_model" | ||
| years = "1995-1996", |
36 changes: 36 additions & 0 deletions
36
tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_parallel_chrysalis.cfg
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| [default] | ||
| case = "v2.LR.historical_0201" | ||
| constraint = "" | ||
| dry_run = "False" | ||
| environment_commands = "" | ||
| input = /lcrc/group/e3sm/ac.forsyth2//E3SMv2/v2.LR.historical_0201 | ||
| input_subdir = archive/atm/hist | ||
| mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" | ||
| output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_parallel_output/unique_id/v2.LR.historical_0201" | ||
| partition = "debug" | ||
| qos = "regular" | ||
| www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_parallel_www/unique_id" | ||
| years = "1985:1989:2", | ||
|
|
||
| [tc_analysis] | ||
| active = True | ||
| scratch = "/lcrc/globalscratch/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_parallel_scratch/unique_id/v2.LR.historical_0201" | ||
| walltime = "00:30:00" | ||
|
|
||
| [e3sm_diags] | ||
| active = True | ||
| environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_20241015" | ||
| grid = '180x360_aave' | ||
| multiprocessing = True | ||
| num_workers = 8 | ||
| partition = "compute" | ||
| qos = "regular" | ||
| short_name = "v2.LR.historical_0201" | ||
| ts_num_years = 2 | ||
| walltime = "5:00:00" | ||
|
|
||
| [[ atm_monthly_180x360_aave_tc_analysis ]] | ||
| # Expecting two viewers: 1985-1986, 1987-1988 | ||
| # The generation of these two viewers should occur in parallel. | ||
| sets = "tc_analysis", | ||
| # tc_obs is determined automatically |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8 changes: 4 additions & 4 deletions
8
tests/integration/generated/test_min_case_tc_analysis_simultaneous_1_chrysalis.cfg
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,18 +1,18 @@ | ||
| [default] | ||
| case = "v3.LR.historical_0051" | ||
| case = "v2.LR.historical_0201" | ||
| constraint = "" | ||
| dry_run = "False" | ||
| environment_commands = "" | ||
| input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/v3.LR.historical_0051 | ||
| input = /lcrc/group/e3sm/ac.forsyth2//E3SMv2/v2.LR.historical_0201 | ||
| input_subdir = archive/atm/hist | ||
| mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" | ||
| output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_tc_analysis_simultaneous_1_output/unique_id/v3.LR.historical_0051" | ||
| output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_tc_analysis_simultaneous_1_output/unique_id/v2.LR.historical_0201" | ||
| partition = "debug" | ||
| qos = "regular" | ||
| www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_tc_analysis_simultaneous_1_www/unique_id" | ||
| years = "1985:1987:2", | ||
|
|
||
| [tc_analysis] | ||
| active = True | ||
| scratch = "/lcrc/globalscratch/ac.forsyth2/zppy_min_case_tc_analysis_simultaneous_1_scratch/unique_id/v3.LR.historical_0051" | ||
| scratch = "/lcrc/globalscratch/ac.forsyth2/zppy_min_case_tc_analysis_simultaneous_1_scratch/unique_id/v2.LR.historical_0201" | ||
| walltime = "00:30:00" |
8 changes: 4 additions & 4 deletions
8
tests/integration/generated/test_min_case_tc_analysis_simultaneous_2_chrysalis.cfg
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,20 +1,20 @@ | ||
| # Run this immediately after running _1 | ||
|
|
||
| [default] | ||
| case = "v3.LR.historical_0051" | ||
| case = "v2.LR.historical_0201" | ||
| constraint = "" | ||
| dry_run = "False" | ||
| environment_commands = "" | ||
| input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/v3.LR.historical_0051 | ||
| input = /lcrc/group/e3sm/ac.forsyth2//E3SMv2/v2.LR.historical_0201 | ||
| input_subdir = archive/atm/hist | ||
| mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" | ||
| output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_tc_analysis_simultaneous_2_output/unique_id/v3.LR.historical_0051" | ||
| output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_tc_analysis_simultaneous_2_output/unique_id/v2.LR.historical_0201" | ||
| partition = "debug" | ||
| qos = "regular" | ||
| www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_tc_analysis_simultaneous_2_www/unique_id" | ||
| years = "1985:1987:2", | ||
|
|
||
| [tc_analysis] | ||
| active = True | ||
| scratch = "/lcrc/globalscratch/ac.forsyth2/zppy_min_case_tc_analysis_simultaneous_2_scratch/unique_id/v3.LR.historical_0051" | ||
| scratch = "/lcrc/globalscratch/ac.forsyth2/zppy_min_case_tc_analysis_simultaneous_2_scratch/unique_id/v2.LR.historical_0201" | ||
| walltime = "00:30:00" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8 changes: 4 additions & 4 deletions
8
tests/integration/template_min_case_e3sm_diags_tc_analysis_mvm_1.cfg
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,18 +1,18 @@ | ||
| [default] | ||
| case = "#expand case_name#" | ||
| case = "#expand case_name_v2#" | ||
| constraint = "#expand constraint#" | ||
| dry_run = "#expand dry_run#" | ||
| environment_commands = "#expand environment_commands#" | ||
| input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/#expand case_name# | ||
| input = #expand user_input#/E3SMv2/#expand case_name_v2# | ||
| input_subdir = archive/atm/hist | ||
| mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" | ||
| output = "#expand user_output#zppy_min_case_e3sm_diags_tc_analysis_mvm_1_output/#expand unique_id#/#expand case_name#" | ||
| output = "#expand user_output#zppy_min_case_e3sm_diags_tc_analysis_mvm_1_output/#expand unique_id#/#expand case_name_v2#" | ||
| partition = "#expand partition_short#" | ||
| qos = "#expand qos_short#" | ||
| www = "#expand user_www#zppy_min_case_e3sm_diags_tc_analysis_mvm_2_www/#expand unique_id#" | ||
| years = "1985:1987:2", | ||
|
|
||
| [tc_analysis] | ||
| active = True | ||
| scratch = "#expand scratch#zppy_min_case_e3sm_diags_tc_analysis_mvm_1_scratch/#expand unique_id#/#expand case_name#" | ||
| scratch = "#expand scratch#zppy_min_case_e3sm_diags_tc_analysis_mvm_1_scratch/#expand unique_id#/#expand case_name_v2#" | ||
| walltime = "00:30:00" |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Any test using
tc_analysisnow uses the v2 input data because of E3SM-Project/e3sm_diags#866 (comment)