Skip to content

Commit

Permalink
MOM6: Merge branch 'Hallberg-NOAA-streamline_restore_state' into dev/…
Browse files Browse the repository at this point in the history 
…gfdl

- Corrects typos in MOM_parameter_doc.layout

- NOAA-GFDL/MOM6@50502d4 Merge branch 'Hallberg-NOAA-streamline_restore_state' into dev/gfdl
- NOAA-GFDL/MOM6@62f2e96 +Eliminated use_io_layout from the MOM_domain_type
  • Loading branch information
@adcroft
adcroft committed Aug 24, 2018
1 parent 5dcd7c3 commit b864fed
Show file tree
Hide file tree
Showing 75 changed files with 151 additions and 151 deletions.
4 changes: 2 additions & 2 deletions coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.layout
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,10 @@ NIPROC = 10 !
! The number of processors in the x-direction. With
! STATIC_MEMORY_ this is set in MOM_memory.h at compile time.
NJPROC = 6 !
! The number of processors in the x-direction. With
! The number of processors in the y-direction. With
! STATIC_MEMORY_ this is set in MOM_memory.h at compile time.
LAYOUT = 10, 6 !
! The processor layout that was acutally used.
! The processor layout that was actually used.
IO_LAYOUT = 1, 1 ! default = 1
! The processor layout to be used, or 0,0 to automatically
! set the io_layout to be the same as the layout.
Expand Down
4 changes: 2 additions & 2 deletions coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.layout
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,10 @@ NIPROC = 10 !
! The number of processors in the x-direction. With
! STATIC_MEMORY_ this is set in MOM_memory.h at compile time.
NJPROC = 6 !
! The number of processors in the x-direction. With
! The number of processors in the y-direction. With
! STATIC_MEMORY_ this is set in MOM_memory.h at compile time.
LAYOUT = 10, 6 !
! The processor layout that was acutally used.
! The processor layout that was actually used.
IO_LAYOUT = 1, 1 ! default = 1
! The processor layout to be used, or 0,0 to automatically
! set the io_layout to be the same as the layout.
Expand Down
4 changes: 2 additions & 2 deletions coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/SIS_parameter_doc.layout
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,10 @@ NIPROC = 6 !
! The number of processors in the x-direction. With
! STATIC_MEMORY_ this is set in SIS2_memory.h at compile time.
NJPROC = 5 !
! The number of processors in the x-direction. With
! The number of processors in the y-direction. With
! STATIC_MEMORY_ this is set in SIS2_memory.h at compile time.
LAYOUT = 6, 5 !
! The processor layout that was acutally used.
! The processor layout that was actually used.
IO_LAYOUT = 1, 1 ! default = 1
! The processor layout to be used, or 0,0 to automatically
! set the io_layout to be the same as the layout.
Expand Down
4 changes: 2 additions & 2 deletions coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.layout
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,10 @@ NIPROC = 10 !
! The number of processors in the x-direction. With
! STATIC_MEMORY_ this is set in MOM_memory.h at compile time.
NJPROC = 6 !
! The number of processors in the x-direction. With
! The number of processors in the y-direction. With
! STATIC_MEMORY_ this is set in MOM_memory.h at compile time.
LAYOUT = 10, 6 !
! The processor layout that was acutally used.
! The processor layout that was actually used.
IO_LAYOUT = 1, 1 ! default = 1
! The processor layout to be used, or 0,0 to automatically
! set the io_layout to be the same as the layout.
Expand Down
4 changes: 2 additions & 2 deletions coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/SIS_fast_parameter_doc.layout
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,10 @@ NIPROC_FAST = 6 !
! The number of processors in the x-direction. With
! STATIC_MEMORY_ this is set in SIS2_memory.h at compile time.
NJPROC_FAST = 5 !
! The number of processors in the x-direction. With
! The number of processors in the y-direction. With
! STATIC_MEMORY_ this is set in SIS2_memory.h at compile time.
LAYOUT_FAST = 6, 5 !
! The processor layout that was acutally used.
! The processor layout that was actually used.
IO_LAYOUT_FAST = 1, 1 ! default = 1
! The processor layout to be used, or 0,0 to automatically
! set the io_layout to be the same as the layout.
Expand Down
4 changes: 2 additions & 2 deletions coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/SIS_parameter_doc.layout
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,10 @@ NIPROC = 10 !
! The number of processors in the x-direction. With
! STATIC_MEMORY_ this is set in SIS2_memory.h at compile time.
NJPROC = 6 !
! The number of processors in the x-direction. With
! The number of processors in the y-direction. With
! STATIC_MEMORY_ this is set in SIS2_memory.h at compile time.
LAYOUT = 10, 6 !
! The processor layout that was acutally used.
! The processor layout that was actually used.
IO_LAYOUT = 1, 1 ! default = 1
! The processor layout to be used, or 0,0 to automatically
! set the io_layout to be the same as the layout.
Expand Down
4 changes: 2 additions & 2 deletions ice_ocean_SIS2/Baltic/MOM_parameter_doc.layout
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,10 @@ NIPROC = 2 !
! The number of processors in the x-direction. With
! STATIC_MEMORY_ this is set in MOM_memory.h at compile time.
NJPROC = 1 !
! The number of processors in the x-direction. With
! The number of processors in the y-direction. With
! STATIC_MEMORY_ this is set in MOM_memory.h at compile time.
LAYOUT = 2, 1 !
! The processor layout that was acutally used.
! The processor layout that was actually used.
IO_LAYOUT = 1, 1 ! default = 1
! The processor layout to be used, or 0,0 to automatically
! set the io_layout to be the same as the layout.
Expand Down
8 changes: 4 additions & 4 deletions ice_ocean_SIS2/Baltic/SIS_parameter_doc.layout
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,10 @@ NIPROC = 2 !
! The number of processors in the x-direction. With
! STATIC_MEMORY_ this is set in SIS2_memory.h at compile time.
NJPROC = 1 !
! The number of processors in the x-direction. With
! The number of processors in the y-direction. With
! STATIC_MEMORY_ this is set in SIS2_memory.h at compile time.
LAYOUT = 2, 1 !
! The processor layout that was acutally used.
! The processor layout that was actually used.
IO_LAYOUT = 1, 1 ! default = 1
! The processor layout to be used, or 0,0 to automatically
! set the io_layout to be the same as the layout.
Expand Down Expand Up @@ -96,10 +96,10 @@ NIPROC_FAST = 2 !
! The number of processors in the x-direction. With
! STATIC_MEMORY_ this is set in SIS2_memory.h at compile time.
NJPROC_FAST = 1 !
! The number of processors in the x-direction. With
! The number of processors in the y-direction. With
! STATIC_MEMORY_ this is set in SIS2_memory.h at compile time.
LAYOUT_FAST = 2, 1 !
! The processor layout that was acutally used.
! The processor layout that was actually used.
IO_LAYOUT_FAST = 1, 1 ! default = 1
! The processor layout to be used, or 0,0 to automatically
! set the io_layout to be the same as the layout.
4 changes: 2 additions & 2 deletions ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/MOM_parameter_doc.layout
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,10 @@ NIPROC = 2 !
! The number of processors in the x-direction. With
! STATIC_MEMORY_ this is set in MOM_memory.h at compile time.
NJPROC = 1 !
! The number of processors in the x-direction. With
! The number of processors in the y-direction. With
! STATIC_MEMORY_ this is set in MOM_memory.h at compile time.
LAYOUT = 2, 1 !
! The processor layout that was acutally used.
! The processor layout that was actually used.
IO_LAYOUT = 1, 1 ! default = 1
! The processor layout to be used, or 0,0 to automatically
! set the io_layout to be the same as the layout.
Expand Down
4 changes: 2 additions & 2 deletions ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/SIS_parameter_doc.layout
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,10 @@ NIPROC = 2 !
! The number of processors in the x-direction. With
! STATIC_MEMORY_ this is set in SIS2_memory.h at compile time.
NJPROC = 1 !
! The number of processors in the x-direction. With
! The number of processors in the y-direction. With
! STATIC_MEMORY_ this is set in SIS2_memory.h at compile time.
LAYOUT = 2, 1 !
! The processor layout that was acutally used.
! The processor layout that was actually used.
IO_LAYOUT = 1, 1 ! default = 1
! The processor layout to be used, or 0,0 to automatically
! set the io_layout to be the same as the layout.
Expand Down
4 changes: 2 additions & 2 deletions ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.layout
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,10 @@ NIPROC = 4 !
! The number of processors in the x-direction. With
! STATIC_MEMORY_ this is set in MOM_memory.h at compile time.
NJPROC = 4 !
! The number of processors in the x-direction. With
! The number of processors in the y-direction. With
! STATIC_MEMORY_ this is set in MOM_memory.h at compile time.
LAYOUT = 4, 4 !
! The processor layout that was acutally used.
! The processor layout that was actually used.
IO_LAYOUT = 1, 1 ! default = 1
! The processor layout to be used, or 0,0 to automatically
! set the io_layout to be the same as the layout.
Expand Down
4 changes: 2 additions & 2 deletions ice_ocean_SIS2/Baltic_OM4_025/SIS_parameter_doc.layout
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,10 @@ NIPROC = 4 !
! The number of processors in the x-direction. With
! STATIC_MEMORY_ this is set in SIS2_memory.h at compile time.
NJPROC = 4 !
! The number of processors in the x-direction. With
! The number of processors in the y-direction. With
! STATIC_MEMORY_ this is set in SIS2_memory.h at compile time.
LAYOUT = 4, 4 !
! The processor layout that was acutally used.
! The processor layout that was actually used.
IO_LAYOUT = 1, 1 ! default = 1
! The processor layout to be used, or 0,0 to automatically
! set the io_layout to be the same as the layout.
Expand Down
4 changes: 2 additions & 2 deletions ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.layout
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,10 @@ NIPROC = 2 !
! The number of processors in the x-direction. With
! STATIC_MEMORY_ this is set in MOM_memory.h at compile time.
NJPROC = 2 !
! The number of processors in the x-direction. With
! The number of processors in the y-direction. With
! STATIC_MEMORY_ this is set in MOM_memory.h at compile time.
LAYOUT = 2, 2 !
! The processor layout that was acutally used.
! The processor layout that was actually used.
IO_LAYOUT = 1, 1 ! default = 1
! The processor layout to be used, or 0,0 to automatically
! set the io_layout to be the same as the layout.
Expand Down
4 changes: 2 additions & 2 deletions ice_ocean_SIS2/Baltic_OM4_05/SIS_parameter_doc.layout
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,10 @@ NIPROC = 2 !
! The number of processors in the x-direction. With
! STATIC_MEMORY_ this is set in SIS2_memory.h at compile time.
NJPROC = 2 !
! The number of processors in the x-direction. With
! The number of processors in the y-direction. With
! STATIC_MEMORY_ this is set in SIS2_memory.h at compile time.
LAYOUT = 2, 2 !
! The processor layout that was acutally used.
! The processor layout that was actually used.
IO_LAYOUT = 1, 1 ! default = 1
! The processor layout to be used, or 0,0 to automatically
! set the io_layout to be the same as the layout.
Expand Down
4 changes: 2 additions & 2 deletions ice_ocean_SIS2/OM4_025/MOM_parameter_doc.layout
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,10 @@ NIPROC = 32 !
! The number of processors in the x-direction. With
! STATIC_MEMORY_ this is set in MOM_memory.h at compile time.
NJPROC = 18 !
! The number of processors in the x-direction. With
! The number of processors in the y-direction. With
! STATIC_MEMORY_ this is set in MOM_memory.h at compile time.
LAYOUT = 32, 18 !
! The processor layout that was acutally used.
! The processor layout that was actually used.
IO_LAYOUT = 2, 2 ! default = 1
! The processor layout to be used, or 0,0 to automatically
! set the io_layout to be the same as the layout.
Expand Down
4 changes: 2 additions & 2 deletions ice_ocean_SIS2/OM4_025/SIS_parameter_doc.layout
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,10 @@ NIPROC = 32 !
! The number of processors in the x-direction. With
! STATIC_MEMORY_ this is set in SIS2_memory.h at compile time.
NJPROC = 18 !
! The number of processors in the x-direction. With
! The number of processors in the y-direction. With
! STATIC_MEMORY_ this is set in SIS2_memory.h at compile time.
LAYOUT = 32, 18 !
! The processor layout that was acutally used.
! The processor layout that was actually used.
IO_LAYOUT = 2, 2 ! default = 1
! The processor layout to be used, or 0,0 to automatically
! set the io_layout to be the same as the layout.
Expand Down
4 changes: 2 additions & 2 deletions ice_ocean_SIS2/OM4_05/MOM_parameter_doc.layout
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,10 @@ NIPROC = 21 !
! The number of processors in the x-direction. With
! STATIC_MEMORY_ this is set in MOM_memory.h at compile time.
NJPROC = 20 !
! The number of processors in the x-direction. With
! The number of processors in the y-direction. With
! STATIC_MEMORY_ this is set in MOM_memory.h at compile time.
LAYOUT = 21, 20 !
! The processor layout that was acutally used.
! The processor layout that was actually used.
IO_LAYOUT = 1, 1 ! default = 1
! The processor layout to be used, or 0,0 to automatically
! set the io_layout to be the same as the layout.
Expand Down
4 changes: 2 additions & 2 deletions ice_ocean_SIS2/OM4_05/SIS_parameter_doc.layout
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,10 @@ NIPROC = 21 !
! The number of processors in the x-direction. With
! STATIC_MEMORY_ this is set in SIS2_memory.h at compile time.
NJPROC = 20 !
! The number of processors in the x-direction. With
! The number of processors in the y-direction. With
! STATIC_MEMORY_ this is set in SIS2_memory.h at compile time.
LAYOUT = 21, 20 !
! The processor layout that was acutally used.
! The processor layout that was actually used.
IO_LAYOUT = 1, 1 ! default = 1
! The processor layout to be used, or 0,0 to automatically
! set the io_layout to be the same as the layout.
Expand Down
4 changes: 2 additions & 2 deletions ice_ocean_SIS2/SIS2/MOM_parameter_doc.layout
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,10 @@ NIPROC = 10 !
! The number of processors in the x-direction. With
! STATIC_MEMORY_ this is set in MOM_memory.h at compile time.
NJPROC = 6 !
! The number of processors in the x-direction. With
! The number of processors in the y-direction. With
! STATIC_MEMORY_ this is set in MOM_memory.h at compile time.
LAYOUT = 10, 6 !
! The processor layout that was acutally used.
! The processor layout that was actually used.
IO_LAYOUT = 1, 1 ! default = 1
! The processor layout to be used, or 0,0 to automatically
! set the io_layout to be the same as the layout.
Expand Down
4 changes: 2 additions & 2 deletions ice_ocean_SIS2/SIS2/SIS_parameter_doc.layout
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,10 @@ NIPROC = 10 !
! The number of processors in the x-direction. With
! STATIC_MEMORY_ this is set in SIS2_memory.h at compile time.
NJPROC = 6 !
! The number of processors in the x-direction. With
! The number of processors in the y-direction. With
! STATIC_MEMORY_ this is set in SIS2_memory.h at compile time.
LAYOUT = 10, 6 !
! The processor layout that was acutally used.
! The processor layout that was actually used.
IO_LAYOUT = 1, 1 ! default = 1
! The processor layout to be used, or 0,0 to automatically
! set the io_layout to be the same as the layout.
Expand Down
Loading

0 comments on commit b864fed

Please sign in to comment.