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.

Sign up for GitHub

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

Jump to bottom

Introduction of new post phases for performance updates #146

Merged
merged 29 commits into from
Dec 8, 2020
Merged

Introduction of new post phases for performance updates #146

Show file tree
Hide file tree
Changes from 25 commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
8c1a42f
added med_phases_post_glc_mod.F90 which carries out the mapping for g…
Nov 28, 2020
b494a25
added med_phases_post_glc to run sequence
Nov 28, 2020
5bc6ffa
aded a post rof phase
Nov 30, 2020
8f54ebe
merge to mvertens/icesheets
Nov 30, 2020
f520ad9
fix avgdt variable and add nthreads value to gcomp
jedwards4b Nov 30, 2020
e045da7
major performance update for I2000 compset
Dec 1, 2020
59ec4d1
reworked how scalar data was set in med_phases_prep_lnd
Dec 1, 2020
bfd5ca7
more performance improvements
Dec 2, 2020
4589a19
fixed bug introduced in prep_ocn_mod with skipping wave mapping and a…
Dec 3, 2020
a722479
updates for mapping glc->ocn
Dec 4, 2020
bcd340c
Merge remote-tracking branch 'jedwards/fix_avgdt_add_nthreads_to_gcom…
Dec 4, 2020
de28293
removal of nems configuration - since nems driver is used in the future
Dec 4, 2020
7417a5a
fixed compile and restart problem for B compsets
Dec 5, 2020
f3e4d3a
Merge commit '7417a5a' into mvertens/postphases
Dec 5, 2020
7868fba
added post phases for ocn and atm
Dec 5, 2020
386e300
added med_phases_post_lnd
Dec 6, 2020
9ea5b94
added post wave phase
Dec 6, 2020
c310ff3
added post ice phase and fixed call to post atm phase
Dec 6, 2020
f2edb0f
more cleanup of post run phases
Dec 6, 2020
435bb52
unified merge and accum ocn phase and renamed ocn phases to be consis…
Dec 6, 2020
c570780
fixed problems encountered in PR testing
Dec 7, 2020
4a82768
update to pull request template
Dec 7, 2020
bb8214c
updated Makefile new post phase modules
Dec 7, 2020
94cde15
updated pr template to add HAFS
Dec 7, 2020
920bc97
updated module arrays to be initialized to null
Dec 7, 2020
ab8b90c
update med.F90 dependancies
jedwards4b Dec 7, 2020
70b5aac
update cmake file
jedwards4b Dec 7, 2020
c6b58ce
corrected file name
Dec 7, 2020
3a05967
add post_ocn_mod
jedwards4b Dec 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions .github/pull_request_template.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,21 @@ Any User Interface Changes (namelist or namelist defaults changes)?
- [ ] No

Testing performed if application target is CESM:(either UFS-S2S or CESM testing is required):
- [ ] (required) CIME_DRIVER=nuopc scripts_regression_tests.py
- [ ] (recommended) CIME_DRIVER=nuopc scripts_regression_tests.py
- machines:
- details (e.g. failed tests):
- [ ] (required) CESM testlist_drv.xml
- [ ] (recommended) CESM testlist_drv.xml
- machines and compilers:
- details (e.g. failed tests):
- [ ] (optional) CESM prealpha test
- machines and compilers
- details (e.g. failed tests):
- [ ] (other) please described in detail
- machines and compilers
- details (e.g. failed tests):

Testing performed if application target is UFS-S2S:
- [ ] (required) UFS-S2S testing
- [ ] (recommended) UFS-S2S testing
- description:
- details (e.g. failed tests):

Copy link
Collaborator

Choose a reason for hiding this comment

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

Is it possible to add UFS-HAFS to the list?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

@uturuncoglu - good point. I just added it.

Expand Down
18 changes: 9 additions & 9 deletions cime_config/namelist_definition_drv.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,6 @@
</values>
</entry>

<entry id="Profiling@driver_attributes" modify_via_xml="ESMF_PROFILING_LEVEL">
<type>char</type>
<category>nuopc</category>
<group>DRIVER_attributes</group>
<values>
<value>$ESMF_PROFILING_LEVEL</value>
</values>
</entry>

<entry id="Verbosity@med_attributes" modify_via_xml="ESMF_VERBOSITY_LEVEL">
<type>char</type>
<category>nuopc</category>
Expand Down Expand Up @@ -393,6 +384,15 @@
<!-- All components orbital attributes -->
<!-- =========================================== -->

<entry id="Profiling" modify_via_xml="ESMF_PROFILING_LEVEL">
<type>char</type>
<category>nuopc</category>
<group>ALLCOMP_attributes</group>
<values>
<value>$ESMF_PROFILING_LEVEL</value>
</values>
</entry>

<entry id="orb_mode">
<type>char</type>
<category>orbital</category>
Expand Down
46 changes: 26 additions & 20 deletions cime_config/runseq/runseq_D.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,32 +31,38 @@ def gen_runseq(case, coupling_times):

runseq.enter_time_loop(ocn_cpl_time, newtime=((ocn_cpl_time)))

runseq.add_action("MED med_phases_prep_ocn_accum_avg", med_to_ocn)
runseq.add_action("MED -> OCN :remapMethod=redist" , med_to_ocn)
runseq.add_action("MED med_phases_prep_ocn_avg" , med_to_ocn)
runseq.add_action("MED -> OCN :remapMethod=redist" , med_to_ocn)

runseq.enter_time_loop(atm_cpl_time, newtime=((atm_cpl_time < ocn_cpl_time)))

runseq.add_action ("MED med_phases_prep_ocn_map" , med_to_ocn)
runseq.add_action ("MED med_phases_aofluxes_run" , run_ocn and run_atm and (med_to_ocn or med_to_atm))
runseq.add_action ("MED med_phases_prep_ocn_merge" , med_to_ocn)
runseq.add_action ("MED med_phases_prep_ocn_accum_fast" , med_to_ocn)
runseq.add_action ("MED med_phases_ocnalb_run" , med_to_ocn)
runseq.add_action ("MED med_phases_prep_ice" , med_to_ice)
runseq.add_action ("MED -> ICE :remapMethod=redist" , med_to_ice)
runseq.add_action ("ICE" , run_ice)
runseq.add_action ("ROF" , run_rof)
runseq.add_action ("ATM" , run_atm)
runseq.add_action ("ICE -> MED :remapMethod=redist" , run_ice)
runseq.add_action ("MED med_fraction_set" , run_ice)
runseq.add_action ("ROF -> MED :remapMethod=redist" , run_rof)
runseq.add_action ("ATM -> MED :remapMethod=redist" , run_atm)
runseq.add_action ("MED med_phases_history_write" , atm_cpl_time == ocn_cpl_time)
runseq.add_action ("MED med_phases_aofluxes_run" , run_ocn and run_atm and (med_to_ocn or med_to_atm))
runseq.add_action ("MED med_phases_prep_ocn_accum" , med_to_ocn)
runseq.add_action ("MED med_phases_ocnalb_run" , med_to_ocn)

runseq.add_action ("MED med_phases_prep_ice" , med_to_ice)
runseq.add_action ("MED -> ICE :remapMethod=redist" , med_to_ice)

runseq.add_action ("ICE" , run_ice)
runseq.add_action ("ROF" , run_rof)
runseq.add_action ("ATM" , run_atm)

runseq.add_action ("ICE -> MED :remapMethod=redist" , run_ice)
runseq.add_action("MED med_phases_post_ice" , run_ice)

runseq.add_action ("ROF -> MED :remapMethod=redist" , run_rof)
runseq.add_action("MED med_phases_post_rof" , run_rof)

runseq.add_action ("ATM -> MED :remapMethod=redist" , run_atm)
runseq.add_action ("MED med_phases_history_write" , atm_cpl_time == ocn_cpl_time)
runseq.add_action ("MED med_phases_post_atm" , run_atm)

runseq.leave_time_loop(run_rof and (atm_cpl_time < ocn_cpl_time))

runseq.add_action ("OCN", run_ocn)
runseq.add_action ("OCN -> MED :remapMethod=redist" , run_ocn)
runseq.add_action ("MED med_phases_history_write" , atm_cpl_time < ocn_cpl_time)
runseq.add_action ("OCN" , run_ocn)
runseq.add_action ("OCN -> MED :remapMethod=redist" , run_ocn)
runseq.add_action ("MED med_phases_history_write" , atm_cpl_time < ocn_cpl_time)
runseq.add_action ("MED med_phases_post_ocn" , run_ocn)

runseq.leave_time_loop(True)

Expand Down
82 changes: 0 additions & 82 deletions cime_config/runseq/runseq_NEMS.py
View file
Open in desktop

This file was deleted.

5 changes: 2 additions & 3 deletions cime_config/runseq/runseq_TG.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,8 @@ def gen_runseq(case, coupling_times):

runseq.add_action ("LND" , run_lnd)
runseq.add_action ("LND -> MED :remapMethod=redist" , run_lnd)
runseq.add_action ("MED med_fraction_set" , run_lnd)
runseq.add_action ("MED med_phases_prep_glc_accum" , med_to_glc)
runseq.add_action ("MED med_phases_prep_glc_avg" , med_to_glc)
runseq.add_action ("MED med_phases_post_lnd" , run_lnd)
runseq.add_action ("MED med_phases_prep_glc" , med_to_glc)
runseq.add_action ("MED -> GLC :remapMethod=redist" , med_to_glc)
runseq.add_action ("GLC" , run_glc)
runseq.add_action ("GLC -> MED :remapMethod=redist" , run_glc)
Expand Down
Loading