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

Update Compsets, Testlist, and Grid list #173

Merged

Conversation

alperaltuntas
Copy link
Member

  • Update compset names and testlist: Remove MOM from compset aliases.
  • Remove the old MOM6 grids t061 and g16 from input files.

Testing: aux_mom.derecho b4b.

@alperaltuntas
Copy link
Member Author

To be evaluated in conjunction with ESMCI/ccs_config_cesm#177

@@ -3623,8 +3344,8 @@ Global:
EFACTOR - Applies an enhancement factor to the KPP...""
datatype: string
value:
$COMP_WAV in ["ww3", "ww3dev"] and $WAV_GRID != "wtx0.66v1" : "EFACTOR"
$COMP_WAV in ["ww3", "ww3dev"] and $WAV_GRID == "wtx0.66v1" : "SURFACE_BANDS"
$COMP_WAV in ["ww3", "ww3dev"] and $WAV_GRID != "wtx2_3v2" : "EFACTOR"
Copy link
Collaborator

Choose a reason for hiding this comment

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

Change to $WAV_GRID == "ww3a"

$COMP_WAV in ["ww3", "ww3dev"] and $WAV_GRID != "wtx0.66v1" : "EFACTOR"
$COMP_WAV in ["ww3", "ww3dev"] and $WAV_GRID == "wtx0.66v1" : "SURFACE_BANDS"
$COMP_WAV in ["ww3", "ww3dev"] and $WAV_GRID != "wtx2_3v2" : "EFACTOR"
$COMP_WAV in ["ww3", "ww3dev"] and $WAV_GRID == "wtx2_3v2" : "SURFACE_BANDS"
Copy link
Collaborator

Choose a reason for hiding this comment

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

Change to $WAV_GRID in ["wtx2_3v2", "wgx3v7"]

@@ -3633,28 +3354,28 @@ Global:
INPUT - Testing with fixed values.
datatype: string
value:
$COMP_WAV in ["ww3", "ww3dev"] and $WAV_GRID == "wtx0.66v1" : "COUPLER"
$COMP_WAV in ["ww3", "ww3dev"] and $WAV_GRID == "wtx2_3v2" : "COUPLER"
Copy link
Collaborator

Choose a reason for hiding this comment

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

Change to $WAV_GRID in ["wtx2_3v2", "wgx3v7"]

STOKES_DDT:
description: |
default = False
Flag to use Stokes d/dt
datatype: string
value:
$COMP_WAV in ["ww3", "ww3dev"] and $WAV_GRID == "wtx0.66v1" : True
$COMP_WAV in ["ww3", "ww3dev"] and $WAV_GRID == "wtx2_3v2" : True
Copy link
Collaborator

Choose a reason for hiding this comment

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

Change to $WAV_GRID in ["wtx2_3v2", "wgx3v7"] here and lines 3371, 3378, 3387, and 3394.

@@ -46,7 +46,6 @@
<default_value>zstar_65L</default_value>
<values>
<value grid="oi%tx0.25v1">hycom1</value>
<value grid="oi%gx1v6">zstar_60L</value>
Copy link
Collaborator

Choose a reason for hiding this comment

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

Do you want to drop support for the 60 level vertical grid? I think it would be two steps:

  1. remove zstar_60L from the valid_values list three lines up
  2. remove all zstar_60L occurrences in MOM_input.yaml

Copy link
Member Author

Choose a reason for hiding this comment

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

@gustavo-marques Any reason to keep the 60 level vertical grid option?

Copy link
Collaborator

Choose a reason for hiding this comment

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

No reason. Thanks.

@alperaltuntas
Copy link
Member Author

@gustavo-marques, @mnlevy1981, The two commits I've just pushed should address your comments.

Copy link
Collaborator

@mnlevy1981 mnlevy1981 left a comment

Choose a reason for hiding this comment

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

looks good!

@gustavo-marques gustavo-marques self-requested a review July 25, 2024 20:37
@@ -58,15 +40,15 @@
<option name="wallclock">01:30:00</option>
</options>
</test>
<test name="SMS" grid="T62_t025" compset="CMOM">
<test name="SMS" grid="T62_t025" compset="C">

Choose a reason for hiding this comment

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

Are you still supporting the t025 grid in MOM here? Also, still supporting the older CORE forcing?

</machines>
<options>
<option name="wallclock">01:00:00</option>
</options>
</test>
<test name="SMS_Ld2" grid="f09_t232" compset="B1850MOM" testmods="mom/bcompset">
<test name="SMS_Ld2" grid="f09_t232" compset="B1850" testmods="mom/bcompset">

Choose a reason for hiding this comment

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

Should this be ne30pg3 or something?

<machines>
<machine name="derecho" compiler="gnu" category="aux_mom"/>
</machines>
<options>
<option name="wallclock">01:30:00</option>
</options>
</test>
<test name="ERS" grid="TL319_t061_wt061" compset="GMOM_JRA_WD">
<test name="ERS" grid="TL319_t232_wg37" compset="GW_JRA">

Choose a reason for hiding this comment

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

Should I still test g37 and g17 in the standalone D compsets? (ice only)

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.

4 participants