Skip to content

Simplify global ocean dynamic adjustment test cases#682

Merged
xylar merged 12 commits intoMPAS-Dev:mainfrom
xylar:simplify-dynamic-adjustment
Aug 25, 2023
Merged

Simplify global ocean dynamic adjustment test cases#682
xylar merged 12 commits intoMPAS-Dev:mainfrom
xylar:simplify-dynamic-adjustment

Conversation

@xylar
Copy link
Collaborator

@xylar xylar commented Aug 25, 2023

This greatly simplifies the dynamic_adjustment test case in the global_ocean test group. Rather than having to define dynamic adjustment steps in python, they are defined based on config options in a yaml file:

dynamic_adjustment:
  land_ice_flux_mode: data
  get_dt_from_min_res: False

  steps:
    damped_adjustment_1:
      run_duration: 1_00:00:00
      output_interval: 1_00:00:00
      restart_interval: 1_00:00:00
      dt: 02:00:00
      btr_dt: 00:06:00
      Rayleigh_damping_coeff: 1.0e-4

    simulation:
      run_duration: 1_00:00:00
      output_interval: 1_00:00:00
      restart_interval: 1_00:00:00
      dt: 02:00:00
      btr_dt: 00:06:00
      Rayleigh_damping_coeff: None

This is vastly more readable, less error prone and easier to modify during the development process. The flip side is that they are not as flexible, but this seems like a reasonable price to pay. So far, the dynamic adjustment process for all our meshes follows this process. If the ability to modify more namelist options is desirable in the future, we can build this in as well.

Checklist

  • User's Guide has been updated
  • Developer's Guide has been updated
  • API documentation in the Developer's Guide (api.rst) has any new or modified class, method and/or functions listed
  • Documentation has been built locally and changes look as expected
  • Document (in a comment titled Testing in this PR) any testing that was used to verify the changes

@xylar xylar self-assigned this Aug 25, 2023
@xylar xylar force-pushed the simplify-dynamic-adjustment branch from 2b4e687 to cf821cd Compare August 25, 2023 09:31
@xylar
Copy link
Collaborator Author

xylar commented Aug 25, 2023

Testing

All tests were with the default compilers and MPI on Chrysalis.

I have successfully run the IcoswISC240 and ECwISC30to60 test cases with this branch through dynamic adjustment (the latter required a reduction in the max Haney number, which has been added to #666).

I have also successfully run the pr and quwisc240_for_e3sm suites.

Other meshes are expensive to test so they will be fine-tuned as part of their respective PRs (#667, #668, #669, etc.)

@xylar xylar merged commit 53efa2e into MPAS-Dev:main Aug 25, 2023
@xylar xylar deleted the simplify-dynamic-adjustment branch August 25, 2023 10:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant