Skip to content

Conversation

@breichl
Copy link
Contributor

@breichl breichl commented Apr 16, 2025

  • Adds two test cases, one Baltic grid with OM5 settings, and second with OM5 non-Boussinesq settings.
  • These test cases can be used to test several OM5 settings that are not exercised in the current MOM6 test suite.
  • The examples use the OM4 Baltic test case and forcing for simplicity.

brandon.reichl added 2 commits April 11, 2025 13:49
- Adds two test cases, one Baltic grid with OM5 settings, and second with OM5 non-Boussinesq settings.
- These test cases can be used to test several OM5 settings that are not exercised in the current MOM6 test suite.
- The examples use the OM4 Baltic test case and forcing for simplicity.
@breichl breichl requested a review from Hallberg-NOAA April 16, 2025 12:59
@adcroft
Copy link
Member

adcroft commented Apr 16, 2025

@adcroft
Copy link
Member

adcroft commented Apr 16, 2025

It appears the checked-in layout files are inconsistent? The ocean ran with 32 cores in the CI but the ice is recorded with only 10?

$ git diff
diff --git a/ice_ocean_SIS2/Baltic_OM5_025/SIS_parameter_doc.layout b/ice_ocean_SIS2/Baltic_OM5_025/SIS_parameter_doc.layout
index 6a4062941..07d03ed49 100644
--- a/ice_ocean_SIS2/Baltic_OM5_025/SIS_parameter_doc.layout
+++ b/ice_ocean_SIS2/Baltic_OM5_025/SIS_parameter_doc.layout
@@ -36,13 +36,13 @@ MASKTABLE = "MOM_mask_table"    ! default = "MOM_mask_table"
                                 !  4,6
                                 !  1,2
                                 !  3,6
-NIPROC = 2                      !
+NIPROC = 4                      !
                                 ! The number of processors in the x-direction. With STATIC_MEMORY_ this is set
                                 ! in SIS2_memory.h at compile time.
-NJPROC = 5                      !
+NJPROC = 8                      !
                                 ! The number of processors in the y-direction. With STATIC_MEMORY_ this is set
                                 ! in SIS2_memory.h at compile time.
-LAYOUT = 2, 5                   !
+LAYOUT = 4, 8                   !
                                 ! The processor layout that was actually used.
 IO_LAYOUT = 1, 1                ! default = 1, 1
                                 ! The processor layout to be used, or 0,0 to automatically set the io_layout to
diff --git a/ice_ocean_SIS2/Baltic_OM5nb_025/SIS_parameter_doc.layout b/ice_ocean_SIS2/Baltic_OM5nb_025/SIS_parameter_doc.layout
index 6a4062941..07d03ed49 100644
--- a/ice_ocean_SIS2/Baltic_OM5nb_025/SIS_parameter_doc.layout
+++ b/ice_ocean_SIS2/Baltic_OM5nb_025/SIS_parameter_doc.layout
@@ -36,13 +36,13 @@ MASKTABLE = "MOM_mask_table"    ! default = "MOM_mask_table"
                                 !  4,6
                                 !  1,2
                                 !  3,6
-NIPROC = 2                      !
+NIPROC = 4                      !
                                 ! The number of processors in the x-direction. With STATIC_MEMORY_ this is set
                                 ! in SIS2_memory.h at compile time.
-NJPROC = 5                      !
+NJPROC = 8                      !
                                 ! The number of processors in the y-direction. With STATIC_MEMORY_ this is set
                                 ! in SIS2_memory.h at compile time.
-LAYOUT = 2, 5                   !
+LAYOUT = 4, 8                   !
                                 ! The processor layout that was actually used.
 IO_LAYOUT = 1, 1                ! default = 1, 1
                                 ! The processor layout to be used, or 0,0 to automatically set the io_layout to

@breichl
Copy link
Contributor Author

breichl commented Apr 16, 2025

It appears the checked-in layout files are inconsistent? The ocean ran with 32 cores in the CI but the ice is recorded with only 10?

$ git diff
diff --git a/ice_ocean_SIS2/Baltic_OM5_025/SIS_parameter_doc.layout b/ice_ocean_SIS2/Baltic_OM5_025/SIS_parameter_doc.layout
index 6a4062941..07d03ed49 100644
--- a/ice_ocean_SIS2/Baltic_OM5_025/SIS_parameter_doc.layout
+++ b/ice_ocean_SIS2/Baltic_OM5_025/SIS_parameter_doc.layout
@@ -36,13 +36,13 @@ MASKTABLE = "MOM_mask_table"    ! default = "MOM_mask_table"
                                 !  4,6
                                 !  1,2
                                 !  3,6
-NIPROC = 2                      !
+NIPROC = 4                      !
                                 ! The number of processors in the x-direction. With STATIC_MEMORY_ this is set
                                 ! in SIS2_memory.h at compile time.
-NJPROC = 5                      !
+NJPROC = 8                      !
                                 ! The number of processors in the y-direction. With STATIC_MEMORY_ this is set
                                 ! in SIS2_memory.h at compile time.
-LAYOUT = 2, 5                   !
+LAYOUT = 4, 8                   !
                                 ! The processor layout that was actually used.
 IO_LAYOUT = 1, 1                ! default = 1, 1
                                 ! The processor layout to be used, or 0,0 to automatically set the io_layout to
diff --git a/ice_ocean_SIS2/Baltic_OM5nb_025/SIS_parameter_doc.layout b/ice_ocean_SIS2/Baltic_OM5nb_025/SIS_parameter_doc.layout
index 6a4062941..07d03ed49 100644
--- a/ice_ocean_SIS2/Baltic_OM5nb_025/SIS_parameter_doc.layout
+++ b/ice_ocean_SIS2/Baltic_OM5nb_025/SIS_parameter_doc.layout
@@ -36,13 +36,13 @@ MASKTABLE = "MOM_mask_table"    ! default = "MOM_mask_table"
                                 !  4,6
                                 !  1,2
                                 !  3,6
-NIPROC = 2                      !
+NIPROC = 4                      !
                                 ! The number of processors in the x-direction. With STATIC_MEMORY_ this is set
                                 ! in SIS2_memory.h at compile time.
-NJPROC = 5                      !
+NJPROC = 8                      !
                                 ! The number of processors in the y-direction. With STATIC_MEMORY_ this is set
                                 ! in SIS2_memory.h at compile time.
-LAYOUT = 2, 5                   !
+LAYOUT = 4, 8                   !
                                 ! The processor layout that was actually used.
 IO_LAYOUT = 1, 1                ! default = 1, 1
                                 ! The processor layout to be used, or 0,0 to automatically set the io_layout to

Yep, thanks. Should be fixed now.

Copy link
Member

@adcroft adcroft left a comment

Choose a reason for hiding this comment

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

@adcroft adcroft merged commit 535c8d4 into NOAA-GFDL:dev/gfdl Apr 16, 2025
2 checks passed
@marshallward
Copy link
Member

FATAL_UNUSED_PARAMS = True needs to be False for restart testing, since runtimes are configured through input.nml but still get stamped with a DAYMAX.

Few options:

  • Remove FATAL_UNUSED_PARAMS from the config
  • Explicitly set it to false for restart tests
  • Check and don't set DAYMAX if runtime is set in input.nml

@marshallward
Copy link
Member

marshallward commented Apr 18, 2025

Let's do option 2, it changes the least amount of code.

I ended up going with Option 3.

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.

3 participants