diff --git a/component_grids_mct.xml b/component_grids_mct.xml
deleted file mode 100644
index 613c9acf..00000000
--- a/component_grids_mct.xml
+++ /dev/null
@@ -1,664 +0,0 @@
-
-
-
-
-
-
-
-
-
-
- 0 0
- unset
- null is no grid:
-
-
-
-
-
-
-
- 720 360
- $DIN_LOC_ROOT/share/domains/domain.clm/domain.lnd.360x720_cruncep.100429.nc
- $DIN_LOC_ROOT/share/domains/domain.does_not_exist.nc
- Exact half-degree CRUNCEP datm forcing grid with CRUNCEP land-mask -- only valid for DATM/CLM compset
-
-
-
- 5 5
- $DIN_LOC_ROOT/share/domains/domain.clm/domain.lnd.5x5pt-amazon_navy.090715.nc
- 5x5 Amazon regional case -- only valid for DATM/CLM compset
-
-
-
- 464 224
-
- $DIN_LOC_ROOT/share/domains/domain.clm/domain.lnd.0.125nldas2_0.125nldas2.190410.nc
- $DIN_LOC_ROOT/share/domains/domain.clm/domain.ocn.0.125nldas2.190410.nc
- Regional NLDAS-2 grid over the U.S. (0.125 degree resolution; 25-53N, 235-293E)
-
-
-
- 1152 768
- domain.lnd.fv0.23x0.31_gx1v6.100517.nc
- domain.ocn.0.23x0.31_gx1v6_101108.nc
- domain.lnd.fv0.23x0.31_tn1v3.160414.nc
- domain.ocn.fv0.23x0.31_tn1v3.160414.nc
- domain.lnd.fv0.23x0.31_tn0.25v3.160721.nc
- domain.ocn.fv0.23x0.31_tn0.25v3.160721.nc
- 0.23x0.31 is FV 1/4-deg grid:
-
-
-
- 576 384
- domain.lnd.fv0.47x0.63_gx1v6.090407.nc
- domain.ocn.0.47x0.63_gx1v6_090408.nc
- domain.lnd.fv0.47x0.63_gx1v7.180521.nc
- domain.ocn.fv0.47x0.63_gx1v7.180521.nc
- domain.lnd.fv0.47x0.63_tn0.25v3.211026.nc
- domain.ocn.fv0.47x0.63_tn0.25v3.211026.nc
- 0.47x0.63 is FV 1/2-deg grid:
-
-
-
- 288 192
- domain.lnd.fv0.9x1.25_gx1v6.090309.nc
- domain.ocn.0.9x1.25_gx1v6_090403.nc
- domain.lnd.fv0.9x1.25_gx1v7.151020.nc
- domain.ocn.fv0.9x1.25_gx1v7.151020.nc
- domain.lnd.fv0.9x1.25_tx0.66v1.190314.nc
- domain.ocn.fv0.9x1.25_tx0.66v1.190314.nc
- domain.lnd.fv0.9x1.25_tn1v3.160414.nc
- domain.ocn.fv0.9x1.25_tn1v3.160414.nc
- domain.lnd.fv0.9x1.25_tn0.25v3.160721.nc
- domain.ocn.fv0.9x1.25_tn0.25v3.160721.nc
- /glade/u/home/benedict/ys/datain/domain.aqua.fv0.9x1.25.nc
- /glade/u/home/benedict/ys/datain/domain.aqua.fv0.9x1.25.nc
- 0.9x1.25 is FV 1-deg grid:
-
-
-
-
- 144 96
- domain.lnd.fv1.9x2.5_gx1v6.090206.nc
- domain.ocn.1.9x2.5_gx1v6_090403.nc
- domain.lnd.fv1.9x2.5_gx1v7.181205.nc
- domain.ocn.fv1.9x2.5_gx1v7.181205.nc
- domain.aqua.fv1.9x2.5.nc
- 1.9x2.5 is FV 2-deg grid:
-
-
-
- 72 46
- domain.lnd.fv4x5_gx3v7.091218.nc
- domain.ocn.4x5_gx3v7_100120.nc
- 4x5 is FV 4-deg grid:
-
-
-
- 108 72
- domain.lnd.fv2.5x3.33_gx3v7.110223.nc
- domain.ocn.fv2.5x3.33_gx3v7_110223.nc
- 2.5x3.33 is FV 3-deg grid:
-
-
-
- 24 19
- $DIN_LOC_ROOT/share/domains/domain.clm/domain.lnd.fv10x15_USGS.110713.nc
- $DIN_LOC_ROOT/share/domains/domain.clm/domain.ocn.fv10x15_USGS_070807.nc
- $DIN_LOC_ROOT/share/domains/domain.lnd.fv10x15_gx3v7.180321.nc
- $DIN_LOC_ROOT/share/domains/domain.ocn.fv10x15_gx3v7.180321.nc
- 10x15 is FV 10-deg grid:
- For low resolution testing
-
-
-
- 1024 512
-
-
- domain.lnd.T341_gx1v6.111226.nc
- T341 is Gaussian grid:
- Backward compatible for very high resolution Spectral-dycore experiments
-
-
-
- 16 8
- $DIN_LOC_ROOT/share/domains/domain.lnd.T5_gx3v7.181009.nc
- $DIN_LOC_ROOT/share/domains/domain.ocn.T5_gx3v7.181009.nc
- T5 is Gaussian grid:
-
-
-
-
- 256 128
- domain.lnd.T85_gx1v4.060403.nc
- domain.lnd.T85_gx1v4.060403.nc
- T85 is Gaussian grid:
- Backward compatible for high resolution Spectral-dycore experiments
-
-
-
- 192 94
- $DIN_LOC_ROOT/share/domains/domain.lnd.T62_gx1v7.151008.nc
- $DIN_LOC_ROOT/share/domains/domain.lnd.T62_gx1v6.090320.nc
- $DIN_LOC_ROOT/share/domains/domain.lnd.T62_gx3v7.090911.nc
- $DIN_LOC_ROOT/share/domains/domain.lnd.T62_tx0.66v1.190425.nc
- $DIN_LOC_ROOT/share/domains/domain.lnd.T62_tx1v1.090122.nc
- $DIN_LOC_ROOT/share/domains/domain.lnd.T62_tx0.1v2_090623.nc
- $DIN_LOC_ROOT/share/domains/domain.lnd.T62_tx0.1v3.170929.nc
- $DIN_LOC_ROOT/share/domains/domain.lnd.T62_oQU120.160325.nc
- $DIN_LOC_ROOT/share/domains/domain.ocn.T62_gx1v6.130409.nc
- $DIN_LOC_ROOT/share/domains/domain.ocn.T62_gx1v7.151008.nc
- $DIN_LOC_ROOT/share/domains/domain.ocn.T62_gx3v7.130409.nc
- $DIN_LOC_ROOT/share/domains/domain.ocn.T62_tx0.66v1.190425.nc
- $DIN_LOC_ROOT/share/domains/domain.lnd.T62_tn1v3.160414.nc
- $DIN_LOC_ROOT/share/domains/domain.lnd.T62_tn0.25v3.160721.nc
- T62 is Gaussian grid:
-
-
-
- 96 48
- $DIN_LOC_ROOT/share/domains/domain.lnd.T31_gx3v7.130409.nc
- $DIN_LOC_ROOT/share/domains/domain.ocn.T31_gx3v7.130409.nc
- T31 is Gaussian grid:
-
-
-
- 128 64
- $DIN_LOC_ROOT/share/domains/domain.lnd.T42_gx1v7.180727.nc
- $DIN_LOC_ROOT/share/domains/domain.ocn.T42_gx1v7.180727.nc
- T42 is Gaussian grid:
-
-
-
- 1352 1
- $DIN_LOC_ROOT/share/domains/domain.lnd.ne5np4_gx3v7.140810.nc
- $DIN_LOC_ROOT/share/domains/domain.ocn.ne5np4_gx3v7.140810.nc
- ne5np4 is Spectral Elem 6-deg grid:
- For ultra-low resolution spectral element grid testing
-
-
-
- 1350 1
- $DIN_LOC_ROOT/share/domains/domain.lnd.ne5np4.pg2_gx3v7.200311.nc
- $DIN_LOC_ROOT/share/domains/domain.ocn.ne5np4.pg2_gx3v7.200311.nc
- ne5np4 is Spectral Elem 6-deg grid with a 2x2 FVM physics grid:
- EXPERIMENTAL FVM physics grid
-
-
-
- 1350 1
- $DIN_LOC_ROOT/share/domains/domain.lnd.ne5np4.pg3_gx3v7.170605.nc
- $DIN_LOC_ROOT/share/domains/domain.ocn.ne5np4.pg3_gx3v7.170605.nc
- ne5np4 is Spectral Elem 6-deg grid with a 3x3 FVM physics grid:
- EXPERIMENTAL FVM physics grid
-
-
-
- 1350 1
- $DIN_LOC_ROOT/share/domains/domain.lnd.ne5np4.pg4_gx3v7.200319.nc
- $DIN_LOC_ROOT/share/domains/domain.ocn.ne5np4.pg4_gx3v7.200319.nc
- ne5np4 is Spectral Elem 6-deg grid with a 4x4 FVM physics grid:
- EXPERIMENTAL FVM physics grid
-
-
-
- 13826 1
- $DIN_LOC_ROOT/share/domains/domain.lnd.ne16np4_gx1v7.171018.nc
- $DIN_LOC_ROOT/share/domains/domain.ocn.ne16np4_gx1v7.171018.nc
- ne16np4 is Spectral Elem 2-deg grid:
- For low resolution spectral element grid testing
-
-
-
- 13824 1
- $DIN_LOC_ROOT/share/domains/domain.lnd.ne16pg3_gx1v7.171003.nc
- $DIN_LOC_ROOT/share/domains/domain.ocn.ne16pg3_gx1v7.171003.nc
- ne16np4.pg3 is a Spectral Elem 2-deg grid with a 3x3 FVM physics grid:
- EXPERIMENTAL FVM physics grid
-
-
-
- 48602 1
- $DIN_LOC_ROOT/share/domains/domain.lnd.ne30np4_gx1v6.110905.nc
- $DIN_LOC_ROOT/share/domains/domain.ocn.ne30np4_gx1v6_110217.nc
- $DIN_LOC_ROOT/share/domains/domain.lnd.ne30_gx1v7.171003.nc
- $DIN_LOC_ROOT/share/domains/domain.ocn.ne30_gx1v7.171003.nc
- $DIN_LOC_ROOT/share/domains/domain.lnd.ne30np4_tn0.25v3.211029.nc
- $DIN_LOC_ROOT/share/domains/domain.ocn.ne30np4_tn0.25v3.211029.nc
- ne30np4 is Spectral Elem 1-deg grid:
-
-
-
- 21600 1
- $DIN_LOC_ROOT/share/domains/domain.lnd.ne30np4.pg2_gx1v7.200626.nc
- $DIN_LOC_ROOT/share/domains/domain.ocn.ne30np4.pg2_gx1v7.200626.nc
- ne30np4.pg2 is a Spectral Elem 1-deg grid with a 2x2 FVM physics grid:
- EXPERIMENTAL FVM physics grid
-
-
-
- 48600 1
- $DIN_LOC_ROOT/share/domains/domain.lnd.ne30np4.pg3_gx1v7.170605.nc
- $DIN_LOC_ROOT/share/domains/domain.ocn.ne30np4.pg3_gx1v7_170605.nc
- ne30np4.pg3 is a Spectral Elem ne30 grid with a 3x3 FVM physics grid:
- EXPERIMENTAL FVM physics grid
-
-
-
- 86400 1
- $DIN_LOC_ROOT/share/domains/domain.lnd.ne30np4.pg4_gx1v7.170628.nc
- $DIN_LOC_ROOT/share/domains/domain.ocn.ne30np4.pg4_gx1v7.170628.nc
- ne30np4.pg4 is a Spectral Elem 1-deg grid with a 4x4 FVM physics grid:
- EXPERIMENTAL FVM physics grid
-
-
-
- 194402 1
- $DIN_LOC_ROOT/share/domains/domain.lnd.ne60np4_gx1v6.120406.nc
- $DIN_LOC_ROOT/share/domains/domain.ocn.ne60np4_gx1v6.121113.nc
- $DIN_LOC_ROOT/share/domains/domain.lnd.ne60np4_tn0.25v3.210915.nc
- $DIN_LOC_ROOT/share/domains/domain.ocn.ne60np4_tn0.25v3.210915.nc
- ne60np4 is Spectral Elem 1/2-deg grid:
-
-
-
- 86400 1
- $DIN_LOC_ROOT/share/domains/domain.lnd.ne60np4.pg2_gx1v7.170628.nc
- $DIN_LOC_ROOT/share/domains/domain.ocn.ne60np4.pg2_gx1v7.170628.nc
- ne60np4.pg2 is a Spectral Elem 0.5-deg grid with a 2x2 FVM physics grid:
- EXPERIMENTAL FVM physics grid
-
-
-
- 194400 1
- $DIN_LOC_ROOT/share/domains/domain.lnd.ne60np4.pg3_gx1v7.170628.nc
- $DIN_LOC_ROOT/share/domains/domain.ocn.ne60np4.pg3_gx1v7.170628.nc
- ne60np4.pg3 is a Spectral Elem 0.5-deg grid with a 3x3 FVM physics grid:
- EXPERIMENTAL FVM physics grid
-
-
-
- 345600 1
- $DIN_LOC_ROOT/share/domains/domain.lnd.ne60np4.pg4_gx1v7.170628.nc
- $DIN_LOC_ROOT/share/domains/domain.ocn.ne60np4.pg4_gx1v7.170628.nc
- ne60np4.pg4 is a Spectral Elem 0.5-deg grid with a 4x4 FVM physics grid:
- EXPERIMENTAL FVM physics grid
-
-
-
- 777602 1
- $DIN_LOC_ROOT/share/domains/domain.lnd.ne120np4_gx1v6.110502.nc
- $DIN_LOC_ROOT/share/domains/domain.ocn.ne120np4_gx1v6.121113.nc
- $DIN_LOC_ROOT/share/domains/domain.lnd.ne120np4_gx1v7.190718.nc
- $DIN_LOC_ROOT/share/domains/domain.ocn.ne120np4_gx1v7.190718.nc
- ne120np4 is Spectral Elem 1/4-deg grid:
-
-
-
- 345600 1
- $DIN_LOC_ROOT/share/domains/domain.lnd.ne120np4.pg2_gx1v7.170629.nc
- $DIN_LOC_ROOT/share/domains/domain.ocn.ne120np4.pg2_gx1v7.170629.nc
- $DIN_LOC_ROOT/share/domains/domain.lnd.ne120np4.pg2_tx0.1v2.200626.nc
- $DIN_LOC_ROOT/share/domains/domain.ocn.ne120np4.pg2_tx0.1v2.200626.nc
- ne120np4.pg2 is a Spectral Elem 0.25-deg grid with a 2x2 FVM physics grid:
- EXPERIMENTAL FVM physics grid
-
-
-
- 777600 1
- $DIN_LOC_ROOT/share/domains/domain.lnd.ne120np4.pg3_gx1v7.190718.nc
- $DIN_LOC_ROOT/share/domains/domain.ocn.ne120np4.pg3_gx1v7.190718.nc
- $DIN_LOC_ROOT/share/domains/domain.lnd.ne120np4.pg3_tx0.1v3.190820.nc
- $DIN_LOC_ROOT/share/domains/domain.ocn.ne120np4.pg3_tx0.1v3.190820.nc
- ne120np4.pg3 is a Spectral Elem 0.25-deg grid with a 3x3 FVM physics grid:
- EXPERIMENTAL FVM physics grid
-
-
-
- 1382400 1
- $DIN_LOC_ROOT/share/domains/domain.lnd.ne120np4.pg4_gx1v7.170629.nc
- $DIN_LOC_ROOT/share/domains/domain.ocn.ne120np4.pg4_gx1v7.170629.nc
- ne120np4.pg4 is a Spectral Elem 0.25-deg grid with a 4x4 FVM physics grid:
- EXPERIMENTAL FVM physics grid
-
-
-
- 3110402 1
- $DIN_LOC_ROOT/share/domains/domain.lnd.ne240np4_gx1v6.111226.nc
- $DIN_LOC_ROOT/share/domains/domain.ocn.ne240np4_gx1v6.111226.nc
- ne240np4 is Spectral Elem 1/8-deg grid:
- Experimental for very high resolution experiments
-
-
- 1382400 1
- $DIN_LOC_ROOT/share/domains/domain.lnd.ne240np4.pg2_gx1v7.170629.nc
- $DIN_LOC_ROOT/share/domains/domain.ocn.ne240np4.pg2_gx1v7.170629.nc
- ne240np4.pg2 is a Spectral Elem 0.125-deg grid with a 2x2 FVM physics grid:
- EXPERIMENTAL FVM physics grid
-
-
- 3110400 1
- $DIN_LOC_ROOT/share/domains/domain.lnd.ne240np4.pg3_gx1v7.170629.nc
- $DIN_LOC_ROOT/share/domains/domain.ocn.ne240np4.pg3_gx1v7.170629.nc
- ne240np4.pg3 is a Spectral Elem 0.125-deg grid with a 3x3 FVM physics grid:
- EXPERIMENTAL FVM physics grid
-
-
-
- 3863 1
- ne0np4TESTONLY.ne5x4 is a low-resolution refined SE grid for testing:
- Test support only
-
-
-
- 174098 1
- $DIN_LOC_ROOT/share/domains/domain.lnd.ne0CONUSne30x8_gx1v7.190322.nc
- $DIN_LOC_ROOT/share/domains/domain.ocn.ne0CONUSne30x8_gx1v7.190322.nc
- $DIN_LOC_ROOT/share/domains/domain.lnd.ne0CONUSne30x8_tx0.1v2.171010.nc
- $DIN_LOC_ROOT/share/domains/domain.ocn.ne0CONUSne30x8_tx0.1v2.171010.nc
- ne0np4CONUS.ne30x8 is a Spectral Elem 1-deg grid with a 1/8 deg refined region over the continental United States:
- Test support only
-
-
-
- 117398 1
- $DIN_LOC_ROOT/share/domains/domain.lnd.ne0np4.ARCTIC.ne30x4_tx0.1v2.200626.nc
- $DIN_LOC_ROOT/share/domains/domain.ocn.ne0np4.ARCTIC.ne30x4_tx0.1v2.200626.nc
- ne0np4.ARCTIC.ne30x4 is a Spectral Elem 1-deg grid with a 1/4 deg refined region over Arctic:
- Test support only
-
-
-
- 152390 1
- $DIN_LOC_ROOT/share/domains/domain.lnd.ne0np4.ARCTICGRIS.ne30x8_tx0.1v2.200626.nc
- $DIN_LOC_ROOT/share/domains/domain.ocn.ne0np4.ARCTICGRIS.ne30x8_tx0.1v2.200626.nc
- ne0np4.ARCTICGRIS.ne30x8 is a Spectral Elem 1-deg grid with a 1/8 deg refined region over Greenland:
- Test support only
-
-
-
-
- 2562 1
- MPAS-A 480-km quasi-uniform mesh:
-
-
- 10242 1
- MPAS-A 240-km quasi-uniform mesh:
-
-
- 40962 1
- MPAS-A 120-km quasi-uniform mesh:
-
-
- 163842 1
- MPAS-A 60-km quasi-uniform mesh:
-
-
- 655362 1
- MPAS-A 30-km quasi-uniform mesh:
-
-
- 2621442 1
- MPAS-A 15-km quasi-uniform mesh:
-
-
- 6488066 1
- MPAS-A 15-3-km variable-uniform mesh centered over CONUS:
-
-
- 10485762 1
- MPAS-A 7.5-km quasi-uniform mesh:
-
-
- 41943042 1
- MPAS-A 3.75-km variable-uniform mesh:
-
-
-
- 640 320
- $DIN_LOC_ROOT/share/domains/domain.lnd.TL319_gx1v7.170705.nc
- $DIN_LOC_ROOT/share/domains/domain.ocn.TL319_gx1v7.170705.nc
- $DIN_LOC_ROOT/share/domains/domain.lnd.TL319_tx0.66v1.190425.nc
- $DIN_LOC_ROOT/share/domains/domain.ocn.TL319_tx0.66v1.190425.nc
- $DIN_LOC_ROOT/share/domains/domain.lnd.TL319_tx0.1v2.161014.nc
- $DIN_LOC_ROOT/share/domains/domain.ocn.tx0.1v2.161014.nc
- $DIN_LOC_ROOT/share/domains/domain.lnd.TL319_tx0.1v3.170730.nc
- $DIN_LOC_ROOT/share/domains/domain.ocn.tx0.1v3.170730.nc
- TL319 grid for JRA55
-
-
-
- 1440 721
- $DIN_LOC_ROOT/share/domains/domain.lnd.TL639_gx1v7.200619.nc
- $DIN_LOC_ROOT/share/domains/domain.ocn.TL639_gx1v7.200619.nc
- $DIN_LOC_ROOT/share/domains/domain.lnd.TL639_tx0.66v1.200619.nc
- $DIN_LOC_ROOT/share/domains/domain.ocn.TL639_tx0.66v1.200619.nc
- TL639 grid for ERA5
-
-
-
-
-
- 3456 1
- $DIN_LOC_ROOT/share/domains/domain.lnd.C24_gx1v6.181018.nc
- $DIN_LOC_ROOT/share/domains/domain.ocn.C24_gx1v6.181018.nc
- $DIN_LOC_ROOT/share/domains/domain.lnd.C24_gx1v7.181018.nc
- $DIN_LOC_ROOT/share/domains/domain.ocn.C24_gx1v7.181018.nc
- C24 is a fvcubed xx-deg grid:
- Experimental for fv3 dycore
-
-
-
- 13824 1
- $DIN_LOC_ROOT/share/domains/domain.lnd.C48_gx1v6.181018.nc
- $DIN_LOC_ROOT/share/domains/domain.ocn.C48_gx1v6.181018.nc
- $DIN_LOC_ROOT/share/domains/domain.lnd.C48_gx1v7.181018.nc
- $DIN_LOC_ROOT/share/domains/domain.ocn.C48_gx1v7.181018.nc
- C48 is a fvcubed xx-deg grid:
- Experimental for fv3 dycore
-
-
-
- 55296 1
- $DIN_LOC_ROOT/share/domains/domain.lnd.C96_gx1v6.181018.nc
- $DIN_LOC_ROOT/share/domains/domain.ocn.C96_gx1v6.181018.nc
- $DIN_LOC_ROOT/share/domains/domain.lnd.C96_gx1v7.181018.nc
- $DIN_LOC_ROOT/share/domains/domain.ocn.C96_gx1v7.181018.nc
- $DIN_LOC_ROOT/share/domains/domain.lnd.C96_tx0.66v1.181210.nc
- $DIN_LOC_ROOT/share/domains/domain.ocn.C96_tx0.66v1.181210.nc
- C96 is a fvcubed xx-deg grid:
- Experimental for fv3 dycore
-
-
-
- 221184 1
- $DIN_LOC_ROOT/share/domains/domain.lnd.C192_gx1v6.181018.nc
- $DIN_LOC_ROOT/share/domains/domain.ocn.C192_gx1v6.181018.nc
- $DIN_LOC_ROOT/share/domains/domain.lnd.C192_gx1v7.181018.nc
- $DIN_LOC_ROOT/share/domains/domain.ocn.C192_gx1v7.181018.nc
- C192 is a fvcubed xx-deg grid:
- Experimental for fv3 dycore
-
-
-
- 884736 1
- $DIN_LOC_ROOT/share/domains/domain.lnd.C384_gx1v6.181018.nc
- $DIN_LOC_ROOT/share/domains/domain.ocn.C384_gx1v6.181018.nc
- $DIN_LOC_ROOT/share/domains/domain.lnd.C384_gx1v7.181018.nc
- $DIN_LOC_ROOT/share/domains/domain.ocn.C384_gx1v7.181018.nc
- C384 is a fvcubed xx-deg grid:
- Experimental for fv3 dycore
-
-
-
-
-
-
-
- 320 384
- $DIN_LOC_ROOT/share/domains/domain.ocn.gx1v6.090206.nc
- $DIN_LOC_ROOT/share/domains/domain.ocn.gx1v6.090206.nc
- gx1v6 is displaced Greenland pole v6 1-deg grid:
-
-
- 320 384
- $DIN_LOC_ROOT/share/domains/domain.ocn.gx1v7.151008.nc
- $DIN_LOC_ROOT/share/domains/domain.ocn.gx1v7.151008.nc
- gx1v7 is displaced Greenland pole 1-deg grid with Caspian as a land feature:
-
-
- 100 116
- $DIN_LOC_ROOT/share/domains/domain.ocn.gx3v7.120323.nc
- gx3v7 is displaced Greenland pole v7 3-deg grid:
-
-
- 540 458
- $DIN_LOC_ROOT/share/domains/domain.ocn.tx0.66v1.190425.nc
- tx0.66v1 is tripole v1 0.66-deg MOM6 grid:
- Experimental for MOM6 experiments
-
-
- 1440 1080
- $DIN_LOC_ROOT/share/domains/domain.ocn.tx0.25v1.190207.nc
- tx0.25v1 is tripole v1 0.25-deg MOM6 grid:
- Experimental for MOM6 experiments
-
-
- 3600 2400
- $DIN_LOC_ROOT/share/domains/domain.ocn.tx0.1v2.161014.nc
- tx0.1v2 is tripole v2 1/10-deg grid:
- Experimental for high resolution experiments
-
-
- 3600 2400
- $DIN_LOC_ROOT/share/domains/domain.ocn.tx0.1v3.170730.nc
- tx0.1v3 is tripole v3 1/10-deg grid:
- Experimental for high resolution experiments
-
-
- 360 240
- $DIN_LOC_ROOT/share/domains/domain.ocn.tx1v1.090122.nc
- tripole v1 1-deg grid: testing proxy for high-res tripole ocean grids- do not use for scientific experiments
- Experimental tripole ocean grid
-
-
- 28574 1
- $DIN_LOC_ROOT/share/domains/domain.ocn.oQU120.160325.nc
- oQU120 is a MPAS ocean grid that is roughly 1 degree resolution:
- Experimental, under development
-
-
- 360 291
- $DIN_LOC_ROOT/share/domains/domain.ocn.tn1v3.160414.nc
- tn1v3 is NEMO ORCA1 tripole grid at 1 deg (reduced eORCA):
- NEMO ORCA1 tripole ocean grid
-
-
- 1440 1050
- $DIN_LOC_ROOT/share/domains/domain.ocn.tn0.25v3.160721.nc
- tn0.25v3 is NEMO ORCA1 tripole grid at 1/4 deg (reduced eORCA):
- NEMO ORCA1 tripole ocean grid
-
-
-
-
-
-
-
- 360 180
- rx1 is 1 degree river routing grid (only valid for DROF):
- Can only be used by DROF
-
-
-
- 720 360
- r05 is 1/2 degree river routing grid:
-
-
-
-
-
-
-
- 76 141
- 20-km Greenland grid
-
-
-
- 416 704
- 4-km Greenland grid, for use with the glissade dycore
-
-
-
- 704 576
- 8-km Antarctica grid
-
-
-
-
-
-
-
- 90 50
- $DIN_LOC_ROOT/share/domains/domain.lnd.ww3a_ww3a.120222.nc
- $DIN_LOC_ROOT/share/domains/domain.ocn.ww3a_ww3a.120222.nc
- WW3 90 x 50 global grid
- For testing of the WAV model
-
-
-
-
-
-
-
- 1 1
- domain.ocn.01col.ArcticOcean.20150824.nc
- domain.ocn.01col.ArcticOcean.20150824.nc
- 01col is a single-column grid for datm and POP:
-
-
-
- 1 1
- $DIN_LOC_ROOT/share/domains/domain.clm/domain.lnd.${CLM_USRDAT_NAME}_navy.nc
- user specified domain - only valid for DATM/CLM compset
-
-
-
- 1 1
- $DIN_LOC_ROOT/share/domains/domain.clm/domain.lnd.1x1pt-numaIA_navy.110106.nc
- 1x1 Numa Iowa -- only valid for DATM/CLM compset
-
-
- 1 1
- $DIN_LOC_ROOT/share/domains/domain.clm/domain.lnd.1x1pt-brazil_navy.090715.nc
- 1x1 Brazil -- only valid for DATM/CLM compset
-
-
- 1 1
- $DIN_LOC_ROOT/share/domains/domain.clm/domain.lnd.1x1pt-smallvilleIA_test.110106.nc
- 1x1 Smallville Iowa Crop Test Case -- only valid for DATM/CLM compset
-
-
- 1 1
- $DIN_LOC_ROOT/share/domains/domain.clm/domain.lnd.1x1pt-camdenNJ_navy.111004.nc
- 1x1 Camden New Jersey -- only valid for DATM/CLM compset
-
-
- 1 1
- $DIN_LOC_ROOT/share/domains/domain.clm/domain.lnd.1x1pt-mexicocityMEX_navy.090715.nc
- 1x1 Mexico City Mexico -- only valid for DATM/CLM compset
-
-
- 1 1
- $DIN_LOC_ROOT/share/domains/domain.clm/domain.lnd.1x1pt-vancouverCAN_navy.090715.nc
- 1x1 Vancouver Canada -- only valid for DATM/CLM compset
-
-
- 1 1
- $DIN_LOC_ROOT/share/domains/domain.clm/domain.lnd.1x1pt-urbanc_alpha_test.110201.nc
- 1x1 Urban C Alpha Test Case -- only valid for DATM/CLM compset
-
-
-
diff --git a/config_grids_mct.xml b/config_grids_mct.xml
deleted file mode 100644
index 34c0bf3d..00000000
--- a/config_grids_mct.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-
-
-
-
-
- =========================================
- GRID naming convention
- =========================================
- The notation for the grid longname is
- a%name_l%name_oi%name_r%name_m%mask_g%name_w%name
- where
- a% => atm, l% => lnd, oi% => ocn/ice, r% => river, m% => mask, g% => glc, w% => wav
-
- Supported out of the box grid configurations are given via alias specification in
- the file "config_grids.xml". Each grid alias can also be associated with the
- following optional attributes
-
- compset (Regular expression for compset matches that are required for this grid)
- not_compset (Regular expression for compset matches that are not permitted this grid)
-
- Using the alias and the optional "compset" and "not_compset" attributes a grid longname is created
- Note that the mask is for information only - and is not an attribute of the grid
- By default, if the mask is not specified below, it will be set to the ocnice grid
- And if there is no ocnice grid (such as for single column, the mask is null since it does not mean anything)
-
-
-
-
-
-
-
-
- ATM2OCN_FMAPNAME
- ATM2OCN_SMAPNAME
- ATM2OCN_VMAPNAME
- OCN2ATM_FMAPNAME
- OCN2ATM_SMAPNAME
- ATM2LND_FMAPNAME
- ATM2LND_SMAPNAME
- LND2ATM_FMAPNAME
- LND2ATM_SMAPNAME
- ATM2WAV_SMAPNAME
- OCN2WAV_SMAPNAME
- ICE2WAV_SMAPNAME
- ROF2OCN_LIQ_RMAPNAME
- ROF2OCN_ICE_RMAPNAME
- LND2ROF_FMAPNAME
- ROF2LND_FMAPNAME
- LND2GLC_SMAPNAME
- LND2GLC_FMAPNAME
- GLC2LND_SMAPNAME
- GLC2LND_FMAPNAME
- ROF2OCN_FMAPNAME
- WAV2OCN_SMAPNAME
-
-
-
-
-
diff --git a/config_inputdata.xml b/config_inputdata.xml
index 35b6126b..9a00f913 100644
--- a/config_inputdata.xml
+++ b/config_inputdata.xml
@@ -7,28 +7,16 @@
-
- grid ftp requires the globus-url-copy tool on the client side
- gftp
- ftp://gridanon.cgd.ucar.edu:2811/cesm/inputdata/
- ../inputdata_checksum.dat
-
-
wget
- ftp://ftp.cgd.ucar.edu/cesm/inputdata/
- anonymous
- user@example.edu
+ https://ftp.cgd.ucar.edu/cesm/inputdata/
../inputdata_checksum.dat
- ftp requires the python package ftplib
- ftp
- ftp.cgd.ucar.edu/cesm/inputdata
- anonymous
- user@example.edu
- ../inputdata_checksum.dat
+ wget access to subversion
+ wget
+ https://svn-ccsm-inputdata.cgd.ucar.edu/trunk/inputdata/
diff --git a/machines/Depends.intel-oneapi b/machines/Depends.intel-oneapi
index beb9eb76..94644847 100644
--- a/machines/Depends.intel-oneapi
+++ b/machines/Depends.intel-oneapi
@@ -7,11 +7,15 @@ bndry_mod.o \
prim_advance_mod.o
# FMS netcdf_io gives ICE in intel-oneapi/2024.0.2
+
REDUCED_OPT_OBJS=\
netcdf_io.o \
fms_netcdf_domain_io.o \
fms_netcdf_unstructured_domain_io.o
+REDUCED_DEBUG_OBJS=\
+unicon.o
+
# shr_wv_sat_mod does not need to have better than ~0.1% precision, and benefits
# enormously from a lower precision in the vector functions.
REDUCED_PRECISION_OBJS=\
@@ -49,5 +53,8 @@ ifeq ($(DEBUG),FALSE)
$(CC) -c $(INCLDIR) $(INCS) $(CFLAGS) -O3 -fp-model fast $<
$(PUMAS_MG_OBJS): %.o: %.F90
$(FC) -c $(INCLDIR) $(INCS) $(FFLAGS) $(FREEFLAGS) -O3 -no-fma -ftz -no-prec-sqrt -qoverride-limits -no-inline-max-total-size -inline-factor=200 -qopt-report=5 $<
+else
+ $(REDUCED_DEBUG_OBJS): %.o: %.F90
+ $(FC) -c $(INCLDIR) $(INCS) $(FFLAGS) $(FREEFLAGS) -O0 -check nobounds -check nopointers $<
endif
diff --git a/machines/Depends.nvhpc b/machines/Depends.nvhpc
index 84b6596f..22d3e9e3 100644
--- a/machines/Depends.nvhpc
+++ b/machines/Depends.nvhpc
@@ -13,6 +13,18 @@ REDUCED_OPT_OBJS=\
SatellitePhenologyMod.o \
esm.o
+REDUCED_ERRORCHKS_IN_DEBUG=\
+mpp.o \
+horiz_interp_conserve.o \
+data_override.o \
+MOM_io_infra.o \
+dynColumnStateUpdaterMod.o \
+prim_advection_mod.o \
+MARBL_forcing_mod.o \
+MOM_internal_tide_input.o \
+MOM_ice_shelf.o \
+mom_surface_forcing_nuopc.o
+
REDUCED_PRECISION_OBJS=\
shr_wv_sat_mod.o
@@ -154,9 +166,12 @@ ifeq ($(DEBUG),FALSE)
# $(SHR_RANDNUM_C_OBJS): %.o: %.c
# $(CC) -c $(INCLDIR) $(INCS) $(CFLAGS) -O3 -fast $<
$(PUMAS_OBJS): %.o: %.F90
- $(FC) -c $(INCLDIR) $(INCS) $(FFLAGS) $(FREEFLAGS) -O3 -fastsse -Mnofma -Mflushz -Mfprelaxed=sqrt $(GPUFLAGS) $<
+ $(FC) -c $(INCLDIR) $(INCS) $(FFLAGS) $(FREEFLAGS) -O3 -fastsse -Mnofma -Mflushz -Mfprelaxed=sqrt $(OPENACC_GPU_FLAGS) $<
$(RRTMGP_OBJS): %.o: %.F90
- $(FC) -c $(INCLDIR) $(INCS) $(FFLAGS) $(FREEFLAGS) $(GPUFLAGS) $<
+ $(FC) -c $(INCLDIR) $(INCS) $(FFLAGS) $(FREEFLAGS) $(OPENACC_GPU_FLAGS) $<
$(CLUBB_OBJS): %.o: %.F90
- $(FC) -c $(INCLDIR) $(INCS) $(FFLAGS) $(FREEFLAGS) $(GPUFLAGS) $<
+ $(FC) -c $(INCLDIR) $(INCS) $(FFLAGS) $(FREEFLAGS) $(OPENACC_GPU_FLAGS) $<
+else
+ $(REDUCED_ERRORCHKS_IN_DEBUG): %.o: %.F90
+ $(FC) -c $(INCLDIR) $(INCS) $(FFLAGS) $(FREEFLAGS) -Mnobounds -Ktrap=none -Knoieee $<
endif
diff --git a/machines/aleph/config_batch.xml b/machines/aleph/config_batch.xml
new file mode 100644
index 00000000..365c89d5
--- /dev/null
+++ b/machines/aleph/config_batch.xml
@@ -0,0 +1,10 @@
+
+
+ -l nodes={{ num_nodes }}
+ -q iccp
+ -V
+
+
+ iccp
+
+
diff --git a/machines/cmake_macros/intel_aleph.cmake b/machines/aleph/intel_aleph.cmake
similarity index 100%
rename from machines/cmake_macros/intel_aleph.cmake
rename to machines/aleph/intel_aleph.cmake
diff --git a/machines/cmake_macros/athena.cmake b/machines/athena/athena.cmake
similarity index 100%
rename from machines/cmake_macros/athena.cmake
rename to machines/athena/athena.cmake
diff --git a/machines/athena/config_batch.xml b/machines/athena/config_batch.xml
new file mode 100644
index 00000000..eb909a40
--- /dev/null
+++ b/machines/athena/config_batch.xml
@@ -0,0 +1,20 @@
+
+
+
+ -q $JOB_QUEUE
+ -W $JOB_WALLCLOCK_TIME
+ -P $PROJECT
+
+
+ -R "span[ptile={{ tasks_per_node }}]"
+ -N
+ -a {{ poe }}
+
+
+ poe_short
+ poe_medium
+ poe_long
+
+
+
+
diff --git a/machines/cmake_macros/intel_athena.cmake b/machines/athena/intel_athena.cmake
similarity index 100%
rename from machines/cmake_macros/intel_athena.cmake
rename to machines/athena/intel_athena.cmake
diff --git a/machines/aws-hpc6a/config_batch.xml b/machines/aws-hpc6a/config_batch.xml
new file mode 100644
index 00000000..aa4f3289
--- /dev/null
+++ b/machines/aws-hpc6a/config_batch.xml
@@ -0,0 +1,12 @@
+
+ sbatch
+
+ --time $JOB_WALLCLOCK_TIME
+ -p $JOB_QUEUE
+
+
+ regular
+ build
+ serial
+
+
diff --git a/machines/cmake_macros/intel_aws-hpc6a.cmake b/machines/aws-hpc6a/intel_aws-hpc6a.cmake
similarity index 100%
rename from machines/cmake_macros/intel_aws-hpc6a.cmake
rename to machines/aws-hpc6a/intel_aws-hpc6a.cmake
diff --git a/machines/cmake_macros/casper.cmake b/machines/casper/casper.cmake
similarity index 100%
rename from machines/cmake_macros/casper.cmake
rename to machines/casper/casper.cmake
diff --git a/machines/casper/config_batch.xml b/machines/casper/config_batch.xml
new file mode 100644
index 00000000..556f7dac
--- /dev/null
+++ b/machines/casper/config_batch.xml
@@ -0,0 +1,21 @@
+
+
+ qsub
+
+ -l gpu_type=$GPU_TYPE
+
+
+ -S {{ shell }}
+ -l select={{ num_nodes }}:ncpus={{ max_tasks_per_node }}:mpiprocs={{ tasks_per_node }}:ompthreads={{ thread_count }}:mem=700GB:ngpus={{ ngpus_per_node }}:mps=1
+
+
+ -S {{ shell }}
+ -l select={{ num_nodes }}:ncpus={{ max_tasks_per_node }}:mpiprocs={{ tasks_per_node }}:ompthreads={{ thread_count }}:mem=300GB:ngpus={{ ngpus_per_node }}
+
+
+ casper
+
+ casper
+
+
+
diff --git a/machines/cmake_macros/intel_casper.cmake b/machines/casper/intel_casper.cmake
similarity index 100%
rename from machines/cmake_macros/intel_casper.cmake
rename to machines/casper/intel_casper.cmake
diff --git a/machines/cmake_macros/nvhpc_casper.cmake b/machines/casper/nvhpc_casper.cmake
similarity index 100%
rename from machines/cmake_macros/nvhpc_casper.cmake
rename to machines/casper/nvhpc_casper.cmake
diff --git a/machines/cmake_macros/pgi_casper.cmake b/machines/casper/pgi_casper.cmake
similarity index 100%
rename from machines/cmake_macros/pgi_casper.cmake
rename to machines/casper/pgi_casper.cmake
diff --git a/machines/cmake_macros/centos7-linux.cmake b/machines/centos7-linux/centos7-linux.cmake
similarity index 100%
rename from machines/cmake_macros/centos7-linux.cmake
rename to machines/centos7-linux/centos7-linux.cmake
diff --git a/machines/cmake_macros/bluewaters.cmake b/machines/cmake_macros/bluewaters.cmake
deleted file mode 100644
index e69de29b..00000000
diff --git a/machines/cmake_macros/cheyenne.cmake b/machines/cmake_macros/cheyenne.cmake
deleted file mode 100644
index 35c2d3c3..00000000
--- a/machines/cmake_macros/cheyenne.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-if (COMP_NAME STREQUAL gptl)
- string(APPEND CPPDEFS " -DHAVE_NANOTIME -DBIT64 -DHAVE_VPRINTF -DHAVE_BACKTRACE -DHAVE_SLASHPROC -DHAVE_COMM_F2C -DHAVE_TIMES -DHAVE_GETTIMEOFDAY")
-endif()
-set(NETCDF_PATH "$ENV{NETCDF}")
-set(PIO_FILESYSTEM_HINTS "gpfs")
-set(PNETCDF_PATH "$ENV{PNETCDF}")
diff --git a/machines/cmake_macros/gnu_cheyenne.cmake b/machines/cmake_macros/gnu_cheyenne.cmake
deleted file mode 100644
index 988fbb33..00000000
--- a/machines/cmake_macros/gnu_cheyenne.cmake
+++ /dev/null
@@ -1,4 +0,0 @@
-if (COMP_NAME STREQUAL pio1)
- string(APPEND CPPDEFS " -DNO_MPIMOD")
-endif()
-string(APPEND SLIBS " -ldl")
diff --git a/machines/cmake_macros/gnu_hobart.cmake b/machines/cmake_macros/gnu_hobart.cmake
deleted file mode 100644
index 35929dcc..00000000
--- a/machines/cmake_macros/gnu_hobart.cmake
+++ /dev/null
@@ -1 +0,0 @@
-string(APPEND SLIBS " -lm -ldl")
diff --git a/machines/cmake_macros/hobart.cmake b/machines/cmake_macros/hobart.cmake
deleted file mode 100644
index 8894b6a3..00000000
--- a/machines/cmake_macros/hobart.cmake
+++ /dev/null
@@ -1,9 +0,0 @@
-if (COMP_NAME STREQUAL gptl)
- string(APPEND CPPDEFS " -DHAVE_NANOTIME -DBIT64 -DHAVE_VPRINTF -DHAVE_BACKTRACE -DHAVE_SLASHPROC -DHAVE_COMM_F2C -DHAVE_TIMES -DHAVE_GETTIMEOFDAY")
-endif()
-set(LAPACK_LIBDIR "/usr/lib64")
-if (MPILIB STREQUAL mvapich2)
- set(MPI_LIB_NAME "mpich")
-endif()
-set(NETCDF_PATH "$ENV{NETCDF_PATH}")
-string(APPEND SLIBS " -L${NETCDF_PATH}/lib -lnetcdff -lnetcdf")
diff --git a/machines/cmake_macros/ibm_BGQ.cmake b/machines/cmake_macros/ibm_BGQ.cmake
deleted file mode 100644
index 0f113a90..00000000
--- a/machines/cmake_macros/ibm_BGQ.cmake
+++ /dev/null
@@ -1,11 +0,0 @@
-set(CONFIG_ARGS "--build=powerpc-bgp-linux --host=powerpc64-suse-linux")
-string(APPEND CPPDEFS " -DLINUX")
-string(APPEND FFLAGS " -g -qfullpath -qmaxmem=-1 -qspillsize=2500 -qextname=flush")
-if (NOT DEBUG)
- string(APPEND FFLAGS " -O3 -qstrict -qinline=auto")
-endif()
-if (NOT DEBUG AND compile_threaded)
-endif()
-if (DEBUG AND compile_threaded)
-endif()
-set(LDFLAGS "-Wl,--relax -Wl,--allow-multiple-definition")
diff --git a/machines/cmake_macros/intel-oneapi.cmake b/machines/cmake_macros/intel-oneapi.cmake
deleted file mode 120000
index 9e889dc6..00000000
--- a/machines/cmake_macros/intel-oneapi.cmake
+++ /dev/null
@@ -1 +0,0 @@
-intel.cmake
\ No newline at end of file
diff --git a/machines/cmake_macros/intel-oneapi.cmake b/machines/cmake_macros/intel-oneapi.cmake
new file mode 100644
index 00000000..3e12f92d
--- /dev/null
+++ b/machines/cmake_macros/intel-oneapi.cmake
@@ -0,0 +1,63 @@
+string(APPEND CFLAGS " -qno-opt-dynamic-align -fp-model precise -std=gnu99")
+if (compile_threaded)
+ string(APPEND CFLAGS " -qopenmp")
+endif()
+if (NOT DEBUG)
+ string(APPEND CFLAGS " -O2 -debug minimal")
+endif()
+if (DEBUG)
+ string(APPEND CFLAGS " -O0 -g")
+endif()
+string(APPEND CFLAGS " -no-fma")
+string(APPEND CPPDEFS " -DFORTRANUNDERSCORE -DCPRINTEL")
+string(APPEND CXX_LDFLAGS " -cxxlib")
+set(CXX_LINKER "FORTRAN")
+set(FC_AUTO_R8 "-r8")
+string(APPEND FFLAGS " -qno-opt-dynamic-align -convert big_endian -assume byterecl -ftz -traceback -assume realloc_lhs -fp-model source")
+if (compile_threaded)
+ string(APPEND FFLAGS " -qopenmp")
+endif()
+if (DEBUG)
+ string(APPEND FFLAGS " -O0 -g -check bounds -check pointers -fpe0 -check noarg_temp_created")
+endif()
+if (NOT DEBUG)
+ string(APPEND FFLAGS " -O2 -debug minimal")
+endif()
+string(APPEND FFLAGS " -no-fma")
+set(FFLAGS_NOOPT "-O0")
+set(FIXEDFLAGS "-fixed")
+set(FREEFLAGS "-free")
+if (compile_threaded)
+ string(APPEND LDFLAGS " -qopenmp")
+endif()
+set(MPICC "mpicc")
+set(MPICXX "mpicxx")
+set(MPIFC "mpif90")
+set(SCC "icc")
+set(SCXX "icpc")
+set(SFC "ifort")
+if (MPILIB STREQUAL mpich)
+ string(APPEND SLIBS " -mkl=cluster")
+endif()
+if (MPILIB STREQUAL mpich2)
+ string(APPEND SLIBS " -mkl=cluster")
+endif()
+if (MPILIB STREQUAL mvapich)
+ string(APPEND SLIBS " -mkl=cluster")
+endif()
+if (MPILIB STREQUAL mvapich2)
+ string(APPEND SLIBS " -mkl=cluster")
+endif()
+if (MPILIB STREQUAL mpt)
+ string(APPEND SLIBS " -mkl=cluster")
+endif()
+if (MPILIB STREQUAL openmpi)
+ string(APPEND SLIBS " -mkl=cluster")
+endif()
+if (MPILIB STREQUAL impi)
+ string(APPEND SLIBS " -mkl=cluster")
+endif()
+if (MPILIB STREQUAL mpi-serial)
+ string(APPEND SLIBS " -mkl")
+endif()
+set(SUPPORTS_CXX "TRUE")
diff --git a/machines/cmake_macros/intel_bluewaters.cmake b/machines/cmake_macros/intel_bluewaters.cmake
deleted file mode 100644
index 3cb50907..00000000
--- a/machines/cmake_macros/intel_bluewaters.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-set(HAS_F2008_CONTIGUOUS "FALSE")
-string(APPEND FFLAGS " -dynamic -mkl=sequential")
-string(APPEND CFLAGS " -dynamic -mkl=sequential")
diff --git a/machines/cmake_macros/intel_cheyenne.cmake b/machines/cmake_macros/intel_cheyenne.cmake
deleted file mode 100644
index b10bf277..00000000
--- a/machines/cmake_macros/intel_cheyenne.cmake
+++ /dev/null
@@ -1,9 +0,0 @@
-string(APPEND CFLAGS " -qopt-report -xCORE_AVX2")
-string(APPEND FFLAGS " -qopt-report -xCORE_AVX2")
-if (DEBUG)
- string(APPEND CMAKE_OPTS " -DPIO_ENABLE_LOGGING=ON")
-endif()
-if (MPILIB STREQUAL mpi-serial AND NOT compile_threaded)
- set(PFUNIT_PATH "$ENV{CESMDATAROOT}/tools/pFUnit/pFUnit4.7.0_cheyenne_Intel19.1.1_noMPI_noOpenMP")
-endif()
-set(HAS_F2008_CONTIGUOUS "TRUE")
diff --git a/machines/cmake_macros/intel_cori-haswell.cmake b/machines/cmake_macros/intel_cori-haswell.cmake
deleted file mode 100644
index 6fe65eb1..00000000
--- a/machines/cmake_macros/intel_cori-haswell.cmake
+++ /dev/null
@@ -1,9 +0,0 @@
-set(CONFIG_ARGS "--host=cray")
-string(APPEND CFLAGS " -xCORE-AVX2")
-string(APPEND FFLAGS " -xCORE-AVX2")
-string(APPEND SLIBS " -L$(NETCDF_DIR) -lnetcdff -Wl,--as-needed,-L$(NETCDF_DIR)/lib -lnetcdff -lnetcdf")
-if (COMP_NAME STREQUAL gptl)
- string(APPEND CPPDEFS " -DHAVE_SLASHPROC")
-endif()
-string(APPEND LDFLAGS " -mkl")
-set(HAS_F2008_CONTIGUOUS "FALSE")
diff --git a/machines/cmake_macros/intel_cori-knl.cmake b/machines/cmake_macros/intel_cori-knl.cmake
deleted file mode 100644
index 683c1a80..00000000
--- a/machines/cmake_macros/intel_cori-knl.cmake
+++ /dev/null
@@ -1,9 +0,0 @@
-set(CONFIG_ARGS "--host=cray")
-string(APPEND CFLAGS " -xMIC-AVX512")
-string(APPEND FFLAGS " -xMIC-AVX512")
-string(APPEND SLIBS " -L$(NETCDF_DIR) -lnetcdff -Wl,--as-needed,-L$(NETCDF_DIR)/lib -lnetcdff -lnetcdf")
-if (COMP_NAME STREQUAL gptl)
- string(APPEND CPPDEFS " -DHAVE_SLASHPROC")
-endif()
-string(APPEND LDFLAGS " -mkl -lmemkind -zmuldefs")
-set(HAS_F2008_CONTIGUOUS "FALSE")
diff --git a/machines/cmake_macros/intel_edison.cmake b/machines/cmake_macros/intel_edison.cmake
deleted file mode 100644
index 3f41409d..00000000
--- a/machines/cmake_macros/intel_edison.cmake
+++ /dev/null
@@ -1,11 +0,0 @@
-if (NOT DEBUG)
- string(APPEND CFLAGS " -O2")
-endif()
-set(CONFIG_ARGS "--host=cray")
-if (COMP_NAME STREQUAL gptl)
- string(APPEND CPPDEFS " -DHAVE_PAPI")
-endif()
-if (NOT DEBUG)
- string(APPEND FFLAGS " -O2")
-endif()
-string(APPEND SLIBS " -L$ENV{NETCDF_DIR} -lnetcdff -Wl,--as-needed,-L$ENV{NETCDF_DIR}/lib -lnetcdff -lnetcdf")
diff --git a/machines/cmake_macros/intel_hobart.cmake b/machines/cmake_macros/intel_hobart.cmake
deleted file mode 100644
index b5782d88..00000000
--- a/machines/cmake_macros/intel_hobart.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
-string(APPEND CFLAGS " -lifcore")
-string(APPEND FFLAGS " -lifcore")
-if (MPILIB STREQUAL mpi-serial)
- string(APPEND FFLAGS " -mcmodel medium")
-endif()
-string(APPEND LDFLAGS " -lquadmath")
-string(APPEND LDFLAGS " -Wl,-rpath,${NETCDF_PATH}/lib")
-string(APPEND LDFLAGS " -Wl,-rpath,$ENV{COMPILER_PATH}/lib/intel64")
-string(APPEND LDFLAGS " -Wl,-rpath,$ENV{COMPILER_PATH}/mkl/lib/intel64")
-string(APPEND LDFLAGS " -Wl,-rpath,$ENV{MPI_PATH}/lib")
-string(APPEND LDFLAGS " -lifcore")
-if (MPILIB STREQUAL mvapich2)
-endif()
diff --git a/machines/cmake_macros/intel_laramie.cmake b/machines/cmake_macros/intel_laramie.cmake
deleted file mode 100644
index ba6a09da..00000000
--- a/machines/cmake_macros/intel_laramie.cmake
+++ /dev/null
@@ -1,5 +0,0 @@
-string(APPEND CFLAGS " -vec-report")
-string(APPEND FFLAGS " -vec-report")
-if (DEBUG)
- string(APPEND CMAKE_OPTS " -DPIO_ENABLE_LOGGING=ON")
-endif()
diff --git a/machines/cmake_macros/laramie.cmake b/machines/cmake_macros/laramie.cmake
deleted file mode 100644
index 35c2d3c3..00000000
--- a/machines/cmake_macros/laramie.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-if (COMP_NAME STREQUAL gptl)
- string(APPEND CPPDEFS " -DHAVE_NANOTIME -DBIT64 -DHAVE_VPRINTF -DHAVE_BACKTRACE -DHAVE_SLASHPROC -DHAVE_COMM_F2C -DHAVE_TIMES -DHAVE_GETTIMEOFDAY")
-endif()
-set(NETCDF_PATH "$ENV{NETCDF}")
-set(PIO_FILESYSTEM_HINTS "gpfs")
-set(PNETCDF_PATH "$ENV{PNETCDF}")
diff --git a/machines/cmake_macros/nvhpc.cmake b/machines/cmake_macros/nvhpc.cmake
index d541457e..39c91fce 100644
--- a/machines/cmake_macros/nvhpc.cmake
+++ b/machines/cmake_macros/nvhpc.cmake
@@ -51,21 +51,19 @@ set(MPIFC "mpif90")
set(SCC "nvc")
set(SCXX "nvc++")
set(SFC "nvfortran")
-if (GPU_TYPE STREQUAL v100 AND GPU_OFFLOAD STREQUAL openacc)
- string(APPEND GPUFLAGS " -acc -gpu=cc70,lineinfo,nofma -Minfo=accel ")
-endif()
-if (GPU_TYPE STREQUAL v100 AND GPU_OFFLOAD STREQUAL openmp)
- string(APPEND GPUFLAGS " -mp=gpu -gpu=cc70,lineinfo,nofma -Minfo=accel ")
-endif()
-if (GPU_TYPE STREQUAL v100 AND GPU_OFFLOAD STREQUAL combined)
- string(APPEND GPUFLAGS " -acc -gpu=cc70,lineinfo,nofma -mp=gpu -Minfo=accel ")
-endif()
-if (GPU_TYPE STREQUAL a100 AND GPU_OFFLOAD STREQUAL openacc)
- string(APPEND GPUFLAGS " -acc -gpu=cc80,lineinfo,nofma -Minfo=accel ")
-endif()
-if (GPU_TYPE STREQUAL a100 AND GPU_OFFLOAD STREQUAL openmp)
- string(APPEND GPUFLAGS " -mp=gpu -gpu=cc80,lineinfo,nofma -Minfo=accel ")
-endif()
-if (GPU_TYPE STREQUAL a100 AND GPU_OFFLOAD STREQUAL combined)
- string(APPEND GPUFLAGS " -acc -gpu=cc80,lineinfo,nofma -mp=gpu -Minfo=accel")
-endif()
+if (GPU_TYPE STREQUAL v100)
+ if (OPENACC_GPU_OFFLOAD)
+ string(APPEND OPENACC_GPU_FLAGS " -acc -gpu=cc70,lineinfo,nofma -Minfo=accel ")
+ endif()
+ if (OPENMP_GPU_OFFLOAD)
+ string(APPEND OPENMP_GPU_FLAGS " -mp=gpu -gpu=cc70,lineinfo,nofma -Minfo=accel ")
+ endif()
+endif()
+if (GPU_TYPE STREQUAL a100)
+ if (OPENACC_GPU_OFFLOAD)
+ string(APPEND OPENACC_GPU_FLAGS " -acc -gpu=cc80,lineinfo,nofma -Minfo=accel ")
+ endif()
+ if (OPENMP_GPU_OFFLOAD)
+ string(APPEND OPENMP_GPU_FLAGS " -mp=gpu -gpu=cc80,lineinfo,nofma -Minfo=accel ")
+ endif()
+endif()
\ No newline at end of file
diff --git a/machines/cmake_macros/nvhpc_cheyenne.cmake b/machines/cmake_macros/nvhpc_cheyenne.cmake
deleted file mode 100644
index e3769dd9..00000000
--- a/machines/cmake_macros/nvhpc_cheyenne.cmake
+++ /dev/null
@@ -1,4 +0,0 @@
-string(APPEND SLIBS " -llapack -lblas")
-if (MPILIB STREQUAL mpi-serial)
- string(APPEND SLIBS " -ldl")
-endif()
diff --git a/machines/cmake_macros/nvhpc_derecho.cmake b/machines/cmake_macros/nvhpc_derecho.cmake
deleted file mode 100644
index f0b3cd87..00000000
--- a/machines/cmake_macros/nvhpc_derecho.cmake
+++ /dev/null
@@ -1,7 +0,0 @@
-if (COMP_NAME STREQUAL mpi-serial)
- string(APPEND CFLAGS " -std=c89 ")
-endif()
-if (NOT DEBUG)
- string(APPEND FFLAGS " -tp=zen3")
-endif()
-message("GPU_TYPE is ${GPU_TYPE} GPU_OFFLOAD is ${GPU_OFFLOAD}")
diff --git a/machines/cmake_macros/pgi_bluewaters.cmake b/machines/cmake_macros/pgi_bluewaters.cmake
deleted file mode 100644
index ff5f1603..00000000
--- a/machines/cmake_macros/pgi_bluewaters.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-if (NOT DEBUG)
- string(APPEND CFLAGS " -O2")
-endif()
-string(APPEND CFLAGS " -nofma")
-set(CXX_LIBS "-lmpichf90_pgi $ENV{PGI_PATH}/linux86-64/$ENV{PGI_VERSION}/lib/f90main.o")
-if (NOT DEBUG)
- string(APPEND FFLAGS " -O2")
-endif()
-string(APPEND FFLAGS " -nofma")
-set(SUPPORTS_CXX "TRUE")
diff --git a/machines/cmake_macros/pgi_cheyenne.cmake b/machines/cmake_macros/pgi_cheyenne.cmake
deleted file mode 100644
index e3769dd9..00000000
--- a/machines/cmake_macros/pgi_cheyenne.cmake
+++ /dev/null
@@ -1,4 +0,0 @@
-string(APPEND SLIBS " -llapack -lblas")
-if (MPILIB STREQUAL mpi-serial)
- string(APPEND SLIBS " -ldl")
-endif()
diff --git a/machines/cmake_macros/pgi_hobart.cmake b/machines/cmake_macros/pgi_hobart.cmake
deleted file mode 100644
index d3daece9..00000000
--- a/machines/cmake_macros/pgi_hobart.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-if (NOT DEBUG)
- string(APPEND CFLAGS " -O0")
-endif()
-if (NOT DEBUG)
- string(APPEND FFLAGS " -O0")
-endif()
-string(APPEND LDFLAGS " -lgomp")
-string(APPEND LDFLAGS " -Wl,-R${NETCDF_PATH}/lib")
-string(APPEND LDFLAGS " -Wl,-R$ENV{COMPILER_PATH}/lib")
-string(APPEND LDFLAGS " -Wl,-R$ENV{COMPILER_PATH}/libso")
diff --git a/machines/coeus/config_batch.xml b/machines/coeus/config_batch.xml
new file mode 100644
index 00000000..e25ae4be
--- /dev/null
+++ b/machines/coeus/config_batch.xml
@@ -0,0 +1,24 @@
+
+
+ squeue
+ sbatch
+ scancel
+ #SBATCH
+ (\d+)$
+ ,
+ %H:%M:%S
+ --mail-user
+ --mail-type
+ none, all, begin, end, fail
+
+ --job-name={{ job_id }}
+ --nodes={{ num_nodes }}
+ --ntasks-per-node={{ tasks_per_node }}
+ --output={{ job_id }}
+ --exclusive
+
+
+ medium
+
+
+
diff --git a/machines/cmake_macros/gnu_coeus.cmake b/machines/coeus/gnu_coeus.cmake
similarity index 100%
rename from machines/cmake_macros/gnu_coeus.cmake
rename to machines/coeus/gnu_coeus.cmake
diff --git a/machines/config_batch.xml b/machines/config_batch.xml
index 1f1052fa..765c5a0b 100644
--- a/machines/config_batch.xml
+++ b/machines/config_batch.xml
@@ -53,18 +53,6 @@
-
- sbatch
-
- --time $JOB_WALLCLOCK_TIME
- -p $JOB_QUEUE
-
-
- regular
- build
- serial
-
-
qstat
@@ -180,492 +168,4 @@
-
-
- -l nodes={{ num_nodes }}
- -q iccp
- -V
-
-
-
- iccp
-
-
-
-
-
-
- -q $JOB_QUEUE
- -W $JOB_WALLCLOCK_TIME
- -P $PROJECT
-
-
- -R "span[ptile={{ tasks_per_node }}]"
- -N
- -a {{ poe }}
-
-
- poe_short
- poe_medium
- poe_long
-
-
-
-
-
- qsub
-
- -l gpu_type=$GPU_TYPE
-
-
- -S {{ shell }}
- -l select={{ num_nodes }}:ncpus={{ max_tasks_per_node }}:mpiprocs={{ tasks_per_node }}:ompthreads={{ thread_count }}:mem=700GB:ngpus={{ ngpus_per_node }}:mps=1
-
-
- -S {{ shell }}
- -l select={{ num_nodes }}:ncpus={{ max_tasks_per_node }}:mpiprocs={{ tasks_per_node }}:ompthreads={{ thread_count }}:mem=300GB:ngpus={{ ngpus_per_node }}
-
-
- casper
-
- casper
-
-
-
-
-
- squeue
- sbatch
- scancel
- #SBATCH
- (\d+)$
- ,
- %H:%M:%S
- --mail-user
- --mail-type
- none, all, begin, end, fail
-
- --job-name={{ job_id }}
- --nodes={{ num_nodes }}
- --ntasks-per-node={{ tasks_per_node }}
- --output={{ job_id }}
- --exclusive
-
-
- medium
-
-
-
-
- sbatch
-
- --time $JOB_WALLCLOCK_TIME
- -p $JOB_QUEUE
- --account $PROJECT
-
-
-
-
- sbatch
-
- --time $JOB_WALLCLOCK_TIME
- -p $JOB_QUEUE
- --account $PROJECT
-
-
- default
-
-
-
-
- qsub
-
- -l job_priority=$JOB_PRIORITY
-
-
- -S {{ shell }}
- -l select={{ num_nodes }}:ncpus={{ max_tasks_per_node }}:mpiprocs={{ tasks_per_node }}:ompthreads={{ thread_count }}:mem=230GB
-
-
- -S {{ shell }}
- -l select={{ num_nodes }}:ncpus={{ max_cputasks_per_gpu_node }}:mpiprocs={{ tasks_per_node }}:ompthreads={{ thread_count }}:mem=480GB:ngpus={{ ngpus_per_node }}:mps=1
-
-
- develop
- main
-
-
-
-
- sbatch
-
- --time $JOB_WALLCLOCK_TIME
- -p $JOB_QUEUE
- --account $PROJECT
-
-
- batch
-
-
-
-
-
-
- -R "select[model==XeonE5_2680v3]"
-
-
- normal.24h
- normal.4h
-
-
-
-
-
-
- -R "span[ptile=4] select[model==XeonE3_1585Lv5]"
-
-
- normal.24h
- normal.4h
-
-
-
-
-
-
- -R "select[model==XeonGold_6150]"
-
-
- normal.24h
- normal.4h
-
-
-
-
-
- ssh login1 cd $CASEROOT ; sbatch
-
- --time $JOB_WALLCLOCK_TIME
- -p $JOB_QUEUE
- --account $PROJECT
-
-
- --export=ALL
-
-
-
- development
- normal
- large
-
-
-
-
-
-
- -A cpo
- -l {{ partition }}
- -l size={{ mppsize }}
- -E
- -d $RUNDIR
- -o $RUNDIR/$CASE.out
- -S /bin/bash
- -V
-
-
- debug
- batch
-
-
-
-
-
- sbatch
-
- --time $JOB_WALLCLOCK_TIME
- -p $JOB_QUEUE
-
-
-
- sib2.9
- sib2.9,sky2.4
-
-
-
- sbatch
-
- --time $JOB_WALLCLOCK_TIME
- -p $JOB_QUEUE
-
-
-
- sky2.4
- sib2.9,sky2.4
-
-
-
-
- qsub
-
- -l gpu_type=$GPU_TYPE
-
-
- -S {{ shell }}
- -l select={{ num_nodes }}:ncpus={{ max_tasks_per_node }}:mpiprocs={{ tasks_per_node }}:ompthreads={{ thread_count }}
-
-
- -S {{ shell }}
- -l select={{ num_nodes }}:ncpus={{ max_cputasks_per_gpu_node }}:mpiprocs={{ tasks_per_node }}:ompthreads={{ thread_count }}:mem=430GB:ngpus={{ ngpus_per_node }}
-
-
-
-
- main
- bigcpu
-
-
-
-
- qsub
- (\d+.izumi.cgd.ucar.edu)$
-
- -l nodes={{ num_nodes }}:ppn={{ tasks_per_node }}
- -S {{ shell }}
- -V
-
-
- short
- medium
- long
- verylong
- overnight
- monster
-
-
-
-
- sbatch
-
- --qos=lr_normal
- --partition=lr3
- --account={{ project }}
- --ntasks-per-node={{ tasks_per_node }}
-
-
- lr3
-
-
-
-
- ssh login1.ls5.tacc.utexas.edu cd $CASEROOT ; sbatch
-
- --time $JOB_WALLCLOCK_TIME
- -p $JOB_QUEUE
- --account $PROJECT
-
-
- normal
- large
- development
-
-
-
-
-
-
- -l nodes={{ num_nodes }}:ppn={{ tasks_per_node }}
- -S {{ shell }}
- -V
-
-
- batch
-
-
-
-
- sbatch
-
- --time $JOB_WALLCLOCK_TIME
- -p $JOB_QUEUE
- --account $PROJECT
-
-
- queue
-
-
-
-
- sbatch
-
- --time $JOB_WALLCLOCK_TIME
- -q $JOB_QUEUE
- --account $PROJECT
-
-
- -C gpu
-
-
- regular
- debug
-
-
-
-
-
-
- -W group_list=$PROJECT
-
-
- -l select={{ num_nodes }}:ncpus={{ max_tasks_per_node }}:mpiprocs={{ tasks_per_node }}:ompthreads={{ thread_count }}:model=bro
- -l place=scatter:excl
- -S {{ shell }}
- -V
-
-
- normal
- devel
-
-
-
-
-
- -W group_list=$PROJECT
-
-
- -l select={{ num_nodes }}:ncpus={{ max_tasks_per_node }}:mpiprocs={{ tasks_per_node }}:ompthreads={{ thread_count }}:model=has
- -l place=scatter:excl
- -S {{ shell }}
- -V
-
-
- normal
- devel
-
-
-
-
-
- -W group_list=$PROJECT
-
-
- -l select={{ num_nodes }}:ncpus={{ max_tasks_per_node }}:mpiprocs={{ tasks_per_node }}:ompthreads={{ thread_count }}:model=ivy
- -l place=scatter:excl
- -S {{ shell }}
- -V
-
-
- normal
- devel
-
-
-
-
-
- -W group_list=$PROJECT
-
-
- -l select={{ num_nodes }}:ncpus={{ max_tasks_per_node }}:mpiprocs={{ tasks_per_node }}:ompthreads={{ thread_count }}:model=san
- -l place=scatter:excl
- -S {{ shell }}
- -V
-
-
- normal
- devel
-
-
-
-
- ssh stampede2.tacc.utexas.edu cd $CASEROOT ; sbatch
-
- --time $JOB_WALLCLOCK_TIME
- -p $JOB_QUEUE
- --account $PROJECT
-
-
- skx-normal
- skx-dev
-
-
-
-
- ssh stampede2.tacc.utexas.edu cd $CASEROOT ; sbatch
-
- --time $JOB_WALLCLOCK_TIME
- -p $JOB_QUEUE
- --account $PROJECT
-
-
- normal
- development
-
-
-
-
-
- -l nodes={{ num_nodes }}
- -V
-
-
- default
-
-
-
-
- sbatch
-
- --time $JOB_WALLCLOCK_TIME
- -q $JOB_QUEUE
- --account $PROJECT
-
-
- --partition=theia
-
-
- batch
-
-
-
-
-
- default
-
-
-
- sbatch
-
- --time $JOB_WALLCLOCK_TIME
- -q $JOB_QUEUE
-
-
- --ntasks-per-node=64
- --hint=nomultithread
-
-
- regular
-
-
-
-
- -env
-
- -q $JOB_QUEUE
- -W $JOB_WALLCLOCK_TIME
- -P $PROJECT
-
-
- -R "span[ptile={{ tasks_per_node }}]"
-
-
- p_short
- p_medium
- p_long
-
-
-
diff --git a/machines/constance/config_batch.xml b/machines/constance/config_batch.xml
new file mode 100644
index 00000000..20037a2b
--- /dev/null
+++ b/machines/constance/config_batch.xml
@@ -0,0 +1,8 @@
+
+ sbatch
+
+ --time $JOB_WALLCLOCK_TIME
+ -p $JOB_QUEUE
+ --account $PROJECT
+
+
diff --git a/machines/cmake_macros/intel_constance.cmake b/machines/constance/intel_constance.cmake
similarity index 100%
rename from machines/cmake_macros/intel_constance.cmake
rename to machines/constance/intel_constance.cmake
diff --git a/machines/cmake_macros/pgi_constance.cmake b/machines/constance/pgi_constance.cmake
similarity index 100%
rename from machines/cmake_macros/pgi_constance.cmake
rename to machines/constance/pgi_constance.cmake
diff --git a/machines/cmake_macros/container.cmake b/machines/container/container.cmake
similarity index 100%
rename from machines/cmake_macros/container.cmake
rename to machines/container/container.cmake
diff --git a/machines/daint/config_batch.xml b/machines/daint/config_batch.xml
new file mode 100644
index 00000000..2128e6ec
--- /dev/null
+++ b/machines/daint/config_batch.xml
@@ -0,0 +1,11 @@
+
+ sbatch
+
+ --time $JOB_WALLCLOCK_TIME
+ -p $JOB_QUEUE
+ --account $PROJECT
+
+
+ default
+
+
diff --git a/machines/cmake_macros/cray_daint.cmake b/machines/daint/cray_daint.cmake
similarity index 100%
rename from machines/cmake_macros/cray_daint.cmake
rename to machines/daint/cray_daint.cmake
diff --git a/machines/cmake_macros/pgi_daint.cmake b/machines/daint/pgi_daint.cmake
similarity index 100%
rename from machines/cmake_macros/pgi_daint.cmake
rename to machines/daint/pgi_daint.cmake
diff --git a/machines/derecho/config_batch.xml b/machines/derecho/config_batch.xml
new file mode 100644
index 00000000..406411be
--- /dev/null
+++ b/machines/derecho/config_batch.xml
@@ -0,0 +1,19 @@
+
+ qsub
+
+ -l job_priority=$JOB_PRIORITY
+
+
+ -S {{ shell }}
+ -l select={{ num_nodes }}:ncpus={{ max_tasks_per_node }}:mpiprocs={{ tasks_per_node }}:ompthreads={{ thread_count }}:mem={{ mem_per_node }}GB
+
+
+ -S {{ shell }}
+ -l select={{ num_nodes }}:ncpus={{ max_cputasks_per_gpu_node }}:mpiprocs={{ tasks_per_node }}:ompthreads={{ thread_count }}:mem=480GB:ngpus={{ ngpus_per_node }}:mps=1
+
+
+ develop
+ main
+
+
+
diff --git a/machines/derecho/config_machines.xml b/machines/derecho/config_machines.xml
index 120a2000..27ce1eb1 100644
--- a/machines/derecho/config_machines.xml
+++ b/machines/derecho/config_machines.xml
@@ -13,12 +13,11 @@
pbs
cseg
128
+ 10
+ 235
4
128
64
- none,a100
- none,openacc,openmp,combined
- set_gpu_rank
TRUE
mpibind
@@ -72,7 +71,7 @@
cray-mpich/8.1.29
-
+
cuda/12.2.1
@@ -122,7 +121,7 @@
ON
SUMMARY
-
+
-lcuda -lcudart
diff --git a/machines/cmake_macros/derecho.cmake b/machines/derecho/derecho.cmake
similarity index 100%
rename from machines/cmake_macros/derecho.cmake
rename to machines/derecho/derecho.cmake
diff --git a/machines/cmake_macros/intel-oneapi_derecho.cmake b/machines/derecho/intel-oneapi_derecho.cmake
similarity index 100%
rename from machines/cmake_macros/intel-oneapi_derecho.cmake
rename to machines/derecho/intel-oneapi_derecho.cmake
diff --git a/machines/cmake_macros/intel_derecho.cmake b/machines/derecho/intel_derecho.cmake
similarity index 100%
rename from machines/cmake_macros/intel_derecho.cmake
rename to machines/derecho/intel_derecho.cmake
diff --git a/machines/derecho/nvhpc_derecho.cmake b/machines/derecho/nvhpc_derecho.cmake
new file mode 100644
index 00000000..2c497d0f
--- /dev/null
+++ b/machines/derecho/nvhpc_derecho.cmake
@@ -0,0 +1,9 @@
+if (COMP_NAME STREQUAL mpi-serial)
+ string(APPEND CFLAGS " -std=c89 ")
+endif()
+if (NOT DEBUG)
+ string(APPEND FFLAGS " -tp=zen3")
+endif()
+message("GPU_TYPE is ${GPU_TYPE}")
+message("OPENACC_GPU_OFFLOAD is ${OPENACC_GPU_OFFLOAD}")
+message("OPENMP_GPU_OFFLOAD is ${OPENMP_GPU_OFFLOAD}")
\ No newline at end of file
diff --git a/machines/eastwind/config_batch.xml b/machines/eastwind/config_batch.xml
new file mode 100644
index 00000000..bfa4166c
--- /dev/null
+++ b/machines/eastwind/config_batch.xml
@@ -0,0 +1,11 @@
+
+ sbatch
+
+ --time $JOB_WALLCLOCK_TIME
+ -p $JOB_QUEUE
+ --account $PROJECT
+
+
+ batch
+
+
diff --git a/machines/cmake_macros/intel_eastwind.cmake b/machines/eastwind/intel_eastwind.cmake
similarity index 100%
rename from machines/cmake_macros/intel_eastwind.cmake
rename to machines/eastwind/intel_eastwind.cmake
diff --git a/machines/cmake_macros/pgi_eastwind.cmake b/machines/eastwind/pgi_eastwind.cmake
similarity index 100%
rename from machines/cmake_macros/pgi_eastwind.cmake
rename to machines/eastwind/pgi_eastwind.cmake
diff --git a/machines/euler2/config_batch.xml b/machines/euler2/config_batch.xml
new file mode 100644
index 00000000..a68017a7
--- /dev/null
+++ b/machines/euler2/config_batch.xml
@@ -0,0 +1,10 @@
+
+
+
+ -R "select[model==XeonE5_2680v3]"
+
+
+ normal.24h
+ normal.4h
+
+
diff --git a/machines/cmake_macros/euler2.cmake b/machines/euler2/euler2.cmake
similarity index 100%
rename from machines/cmake_macros/euler2.cmake
rename to machines/euler2/euler2.cmake
diff --git a/machines/cmake_macros/intel_euler2.cmake b/machines/euler2/intel_euler2.cmake
similarity index 100%
rename from machines/cmake_macros/intel_euler2.cmake
rename to machines/euler2/intel_euler2.cmake
diff --git a/machines/cmake_macros/pgi_euler2.cmake b/machines/euler2/pgi_euler2.cmake
similarity index 100%
rename from machines/cmake_macros/pgi_euler2.cmake
rename to machines/euler2/pgi_euler2.cmake
diff --git a/machines/euler3/config_batch.xml b/machines/euler3/config_batch.xml
new file mode 100644
index 00000000..d71c8e68
--- /dev/null
+++ b/machines/euler3/config_batch.xml
@@ -0,0 +1,10 @@
+
+
+
+ -R "span[ptile=4] select[model==XeonE3_1585Lv5]"
+
+
+ normal.24h
+ normal.4h
+
+
diff --git a/machines/cmake_macros/euler3.cmake b/machines/euler3/euler3.cmake
similarity index 100%
rename from machines/cmake_macros/euler3.cmake
rename to machines/euler3/euler3.cmake
diff --git a/machines/cmake_macros/intel_euler3.cmake b/machines/euler3/intel_euler3.cmake
similarity index 100%
rename from machines/cmake_macros/intel_euler3.cmake
rename to machines/euler3/intel_euler3.cmake
diff --git a/machines/cmake_macros/pgi_euler3.cmake b/machines/euler3/pgi_euler3.cmake
similarity index 100%
rename from machines/cmake_macros/pgi_euler3.cmake
rename to machines/euler3/pgi_euler3.cmake
diff --git a/machines/euler4/config_batch.xml b/machines/euler4/config_batch.xml
new file mode 100644
index 00000000..a577a05a
--- /dev/null
+++ b/machines/euler4/config_batch.xml
@@ -0,0 +1,11 @@
+
+
+
+
+ -R "select[model==XeonGold_6150]"
+
+
+ normal.24h
+ normal.4h
+
+
diff --git a/machines/cmake_macros/euler4.cmake b/machines/euler4/euler4.cmake
similarity index 100%
rename from machines/cmake_macros/euler4.cmake
rename to machines/euler4/euler4.cmake
diff --git a/machines/cmake_macros/intel_euler4.cmake b/machines/euler4/intel_euler4.cmake
similarity index 100%
rename from machines/cmake_macros/intel_euler4.cmake
rename to machines/euler4/intel_euler4.cmake
diff --git a/machines/cmake_macros/pgi_euler4.cmake b/machines/euler4/pgi_euler4.cmake
similarity index 100%
rename from machines/cmake_macros/pgi_euler4.cmake
rename to machines/euler4/pgi_euler4.cmake
diff --git a/machines/frontera/config_batch.xml b/machines/frontera/config_batch.xml
new file mode 100644
index 00000000..ae0abfba
--- /dev/null
+++ b/machines/frontera/config_batch.xml
@@ -0,0 +1,20 @@
+
+
+ ssh login1 cd $CASEROOT ; sbatch
+
+ --time $JOB_WALLCLOCK_TIME
+ -p $JOB_QUEUE
+ --account $PROJECT
+
+
+ --export=ALL
+
+
+
+ development
+ normal
+ large
+
+
+
diff --git a/machines/cmake_macros/frontera.cmake b/machines/frontera/frontera.cmake
similarity index 100%
rename from machines/cmake_macros/frontera.cmake
rename to machines/frontera/frontera.cmake
diff --git a/machines/gaea/config_batch.xml b/machines/gaea/config_batch.xml
new file mode 100644
index 00000000..68f1d289
--- /dev/null
+++ b/machines/gaea/config_batch.xml
@@ -0,0 +1,18 @@
+
+
+
+
+ -A cpo
+ -l {{ partition }}
+ -l size={{ mppsize }}
+ -E
+ -d $RUNDIR
+ -o $RUNDIR/$CASE.out
+ -S /bin/bash
+ -V
+
+
+ debug
+ batch
+
+
diff --git a/machines/greenplanet-sib29/config_batch.xml b/machines/greenplanet-sib29/config_batch.xml
new file mode 100644
index 00000000..a0098bab
--- /dev/null
+++ b/machines/greenplanet-sib29/config_batch.xml
@@ -0,0 +1,16 @@
+
+
+
+ sbatch
+
+ --time $JOB_WALLCLOCK_TIME
+ -p $JOB_QUEUE
+
+
+
+ sib2.9
+ sib2.9,sky2.4
+
+
diff --git a/machines/cmake_macros/intel_greenplanet-sib29.cmake b/machines/greenplanet-sib29/intel_greenplanet-sib29.cmake
similarity index 100%
rename from machines/cmake_macros/intel_greenplanet-sib29.cmake
rename to machines/greenplanet-sib29/intel_greenplanet-sib29.cmake
diff --git a/machines/greenplanet-sky24/config_batch.xml b/machines/greenplanet-sky24/config_batch.xml
new file mode 100644
index 00000000..6c6ca7eb
--- /dev/null
+++ b/machines/greenplanet-sky24/config_batch.xml
@@ -0,0 +1,14 @@
+
+ sbatch
+
+ --time $JOB_WALLCLOCK_TIME
+ -p $JOB_QUEUE
+
+
+
+ sky2.4
+ sib2.9,sky2.4
+
+
diff --git a/machines/cmake_macros/intel_greenplanet-sky24.cmake b/machines/greenplanet-sky24/intel_greenplanet-sky24.cmake
similarity index 100%
rename from machines/cmake_macros/intel_greenplanet-sky24.cmake
rename to machines/greenplanet-sky24/intel_greenplanet-sky24.cmake
diff --git a/machines/gust/config_batch.xml b/machines/gust/config_batch.xml
new file mode 100644
index 00000000..e8e9a90b
--- /dev/null
+++ b/machines/gust/config_batch.xml
@@ -0,0 +1,21 @@
+
+
+ qsub
+
+ -l gpu_type=$GPU_TYPE
+
+
+ -S {{ shell }}
+ -l select={{ num_nodes }}:ncpus={{ max_tasks_per_node }}:mpiprocs={{ tasks_per_node }}:ompthreads={{ thread_count }}
+
+
+ -S {{ shell }}
+ -l select={{ num_nodes }}:ncpus={{ max_cputasks_per_gpu_node }}:mpiprocs={{ tasks_per_node }}:ompthreads={{ thread_count }}:mem=430GB:ngpus={{ ngpus_per_node }}
+
+
+
+
+ main
+ bigcpu
+
+
diff --git a/machines/cmake_macros/gust.cmake b/machines/gust/gust.cmake
similarity index 100%
rename from machines/cmake_macros/gust.cmake
rename to machines/gust/gust.cmake
diff --git a/machines/cmake_macros/intel_gust.cmake b/machines/gust/intel_gust.cmake
similarity index 100%
rename from machines/cmake_macros/intel_gust.cmake
rename to machines/gust/intel_gust.cmake
diff --git a/machines/cmake_macros/nvhpc_gust.cmake b/machines/gust/nvhpc_gust.cmake
similarity index 100%
rename from machines/cmake_macros/nvhpc_gust.cmake
rename to machines/gust/nvhpc_gust.cmake
diff --git a/machines/cmake_macros/gnu_homebrew.cmake b/machines/homebrew/gnu_homebrew.cmake
similarity index 100%
rename from machines/cmake_macros/gnu_homebrew.cmake
rename to machines/homebrew/gnu_homebrew.cmake
diff --git a/machines/izumi/config_batch.xml b/machines/izumi/config_batch.xml
new file mode 100644
index 00000000..a3623553
--- /dev/null
+++ b/machines/izumi/config_batch.xml
@@ -0,0 +1,18 @@
+
+
+ qsub
+ (\d+.izumi.cgd.ucar.edu)$
+
+ -l nodes={{ num_nodes }}:ppn={{ tasks_per_node }}
+ -S {{ shell }}
+ -V
+
+
+ short
+ medium
+ long
+ verylong
+ overnight
+ monster
+
+
diff --git a/machines/izumi/config_machines.xml b/machines/izumi/config_machines.xml
index 10a0e078..f7b6684f 100644
--- a/machines/izumi/config_machines.xml
+++ b/machines/izumi/config_machines.xml
@@ -71,53 +71,53 @@
mpi
- esmfpkgs/gfortran/9.3.0/esmf-8.5.0-ncdfio-mvapich2-O
+ esmfpkgs/gfortran/9.3.0/esmf-8.6.1-ncdfio-mvapich2-O
mvapich2/2.3.3/gnu/9.3.0/pio/2_5_10
- esmfpkgs/gfortran/9.3.0/esmf-8.5.0-ncdfio-mvapich2-g
+ esmfpkgs/gfortran/9.3.0/esmf-8.6.1-ncdfio-mvapich2-g
mvapich2/2.3.3/gnu/9.3.0/pio/2_5_10
- esmfpkgs/gfortran/9.3.0/esmf-8.5.0-ncdfio-mpiuni-O
+ esmfpkgs/gfortran/9.3.0/esmf-8.6.1-ncdfio-mpiuni-O
mpi-serial/2.3.0/gnu/9.3.0/pio/2_5_10
- esmfpkgs/gfortran/9.3.0/esmf-8.5.0-ncdfio-mpiuni-g
+ esmfpkgs/gfortran/9.3.0/esmf-8.6.1-ncdfio-mpiuni-g
mpi-serial/2.3.0/gnu/9.3.0/pio/2_5_10
- esmfpkgs/nag/6.2/esmf-8.5.0-ncdfio-mvapich2-O
+ esmfpkgs/nag/6.2/esmf-8.6.1-ncdfio-mvapich2-O
mvapich2/2.3.3/nag/6.2/pio/2_5_10
- esmfpkgs/nag/6.2/esmf-8.5.0-ncdfio-mvapich2-g
+ esmfpkgs/nag/6.2/esmf-8.6.1-ncdfio-mvapich2-g
mvapich2/2.3.3/nag/6.2/pio/2_5_10
- esmfpkgs/nag/6.2/esmf-8.5.0-ncdfio-mpiuni-g
+ esmfpkgs/nag/6.2/esmf-8.6.1-ncdfio-mpiuni-g
mpi-serial/2.3.0/nag/6.2/pio/2_5_10
- esmfpkgs/nag/6.2/esmf-8.5.0-ncdfio-mpiuni-O
+ esmfpkgs/nag/6.2/esmf-8.6.1-ncdfio-mpiuni-O
mpi-serial/2.3.0/nag/6.2/pio/2_5_10
- esmfpkgs/intel/20.0.1/esmf-8.5.0-ncdfio-mpiuni-g
+ esmfpkgs/intel/20.0.1/esmf-8.6.1-ncdfio-mpiuni-g
mpi-serial/2.3.0/intel/20.0.1/pio/2_5_10
- esmfpkgs/intel/20.0.1/esmf-8.5.0-ncdfio-mpiuni-O
+ esmfpkgs/intel/20.0.1/esmf-8.6.1-ncdfio-mpiuni-O
mpi-serial/2.3.0/intel/20.0.1/pio/2_5_10
- esmfpkgs/intel/20.0.1/esmf-8.5.0-ncdfio-mvapich2-g
+ esmfpkgs/intel/20.0.1/esmf-8.6.1-ncdfio-mvapich2-g
mvapich2/2.3.3/intel/20.0.1/pio/2_5_10
- esmfpkgs/intel/20.0.1/esmf-8.5.0-ncdfio-mvapich2-O
+ esmfpkgs/intel/20.0.1/esmf-8.6.1-ncdfio-mvapich2-O
mvapich2/2.3.3/intel/20.0.1/pio/2_5_10
diff --git a/machines/cmake_macros/intel_izumi.cmake b/machines/izumi/intel_izumi.cmake
similarity index 100%
rename from machines/cmake_macros/intel_izumi.cmake
rename to machines/izumi/intel_izumi.cmake
diff --git a/machines/cmake_macros/izumi.cmake b/machines/izumi/izumi.cmake
similarity index 100%
rename from machines/cmake_macros/izumi.cmake
rename to machines/izumi/izumi.cmake
diff --git a/machines/izumi/nag_izumi.cmake b/machines/izumi/nag_izumi.cmake
new file mode 100644
index 00000000..116b0ac2
--- /dev/null
+++ b/machines/izumi/nag_izumi.cmake
@@ -0,0 +1 @@
+string(APPEND SLIBS " -L${NETCDF_PATH}/lib -lnetcdff -lnetcdf -Wl,-Wl,,-rpath,$(NETCDF_PATH)/lib")
\ No newline at end of file
diff --git a/machines/cmake_macros/pgi_izumi.cmake b/machines/izumi/pgi_izumi.cmake
similarity index 100%
rename from machines/cmake_macros/pgi_izumi.cmake
rename to machines/izumi/pgi_izumi.cmake
diff --git a/machines/lawrencium-lr3/config_batch.xml b/machines/lawrencium-lr3/config_batch.xml
new file mode 100644
index 00000000..a140ac1e
--- /dev/null
+++ b/machines/lawrencium-lr3/config_batch.xml
@@ -0,0 +1,13 @@
+
+
+ sbatch
+
+ --qos=lr_normal
+ --partition=lr3
+ --account={{ project }}
+ --ntasks-per-node={{ tasks_per_node }}
+
+
+ lr3
+
+
diff --git a/machines/cmake_macros/intel_lawrencium-lr3.cmake b/machines/lawrencium-lr3/intel_lawrencium-lr3.cmake
similarity index 100%
rename from machines/cmake_macros/intel_lawrencium-lr3.cmake
rename to machines/lawrencium-lr3/intel_lawrencium-lr3.cmake
diff --git a/machines/cmake_macros/gnu_lobata.cmake b/machines/lobata/gnu_lobata.cmake
similarity index 100%
rename from machines/cmake_macros/gnu_lobata.cmake
rename to machines/lobata/gnu_lobata.cmake
diff --git a/machines/lonestar5/config_batch.xml b/machines/lonestar5/config_batch.xml
new file mode 100644
index 00000000..e91e45d2
--- /dev/null
+++ b/machines/lonestar5/config_batch.xml
@@ -0,0 +1,14 @@
+
+
+ ssh login1.ls5.tacc.utexas.edu cd $CASEROOT ; sbatch
+
+ --time $JOB_WALLCLOCK_TIME
+ -p $JOB_QUEUE
+ --account $PROJECT
+
+
+ normal
+ large
+ development
+
+
diff --git a/machines/cmake_macros/lonestar5.cmake b/machines/lonestar5/lonestar5.cmake
similarity index 100%
rename from machines/cmake_macros/lonestar5.cmake
rename to machines/lonestar5/lonestar5.cmake
diff --git a/machines/cmake_macros/gnu_melvin.cmake b/machines/melvin/gnu_melvin.cmake
similarity index 100%
rename from machines/cmake_macros/gnu_melvin.cmake
rename to machines/melvin/gnu_melvin.cmake
diff --git a/machines/modex/config_batch.xml b/machines/modex/config_batch.xml
new file mode 100644
index 00000000..ead248cf
--- /dev/null
+++ b/machines/modex/config_batch.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ -l nodes={{ num_nodes }}:ppn={{ tasks_per_node }}
+ -S {{ shell }}
+ -V
+
+
+ batch
+
+
diff --git a/machines/cmake_macros/gnu_modex.cmake b/machines/modex/gnu_modex.cmake
similarity index 100%
rename from machines/cmake_macros/gnu_modex.cmake
rename to machines/modex/gnu_modex.cmake
diff --git a/machines/olympus/config_batch.xml b/machines/olympus/config_batch.xml
new file mode 100644
index 00000000..217abd55
--- /dev/null
+++ b/machines/olympus/config_batch.xml
@@ -0,0 +1,12 @@
+
+
+ sbatch
+
+ --time $JOB_WALLCLOCK_TIME
+ -p $JOB_QUEUE
+ --account $PROJECT
+
+
+ queue
+
+
diff --git a/machines/cmake_macros/pgi_olympus.cmake b/machines/olympus/pgi_olympus.cmake
similarity index 100%
rename from machines/cmake_macros/pgi_olympus.cmake
rename to machines/olympus/pgi_olympus.cmake
diff --git a/machines/perlmutter/config_batch.xml b/machines/perlmutter/config_batch.xml
new file mode 100644
index 00000000..ed14205a
--- /dev/null
+++ b/machines/perlmutter/config_batch.xml
@@ -0,0 +1,17 @@
+
+
+ sbatch
+
+ --time $JOB_WALLCLOCK_TIME
+ -q $JOB_QUEUE
+ --account $PROJECT
+
+
+ -C gpu
+
+
+ regular
+ debug
+
+
+
diff --git a/machines/pleiades-bro/config_batch.xml b/machines/pleiades-bro/config_batch.xml
new file mode 100644
index 00000000..05a90ee5
--- /dev/null
+++ b/machines/pleiades-bro/config_batch.xml
@@ -0,0 +1,16 @@
+
+
+
+ -W group_list=$PROJECT
+
+
+ -l select={{ num_nodes }}:ncpus={{ max_tasks_per_node }}:mpiprocs={{ tasks_per_node }}:ompthreads={{ thread_count }}:model=bro
+ -l place=scatter:excl
+ -S {{ shell }}
+ -V
+
+
+ normal
+ devel
+
+
diff --git a/machines/cmake_macros/pleiades-bro.cmake b/machines/pleiades-bro/pleiades-bro.cmake
similarity index 100%
rename from machines/cmake_macros/pleiades-bro.cmake
rename to machines/pleiades-bro/pleiades-bro.cmake
diff --git a/machines/pleiades-has/config_batch.xml b/machines/pleiades-has/config_batch.xml
new file mode 100644
index 00000000..c0c6202c
--- /dev/null
+++ b/machines/pleiades-has/config_batch.xml
@@ -0,0 +1,17 @@
+
+
+
+ -W group_list=$PROJECT
+
+
+ -l select={{ num_nodes }}:ncpus={{ max_tasks_per_node }}:mpiprocs={{ tasks_per_node }}:ompthreads={{ thread_count }}:model=has
+ -l place=scatter:excl
+ -S {{ shell }}
+ -V
+
+
+ normal
+ devel
+
+
+
diff --git a/machines/cmake_macros/pleiades-has.cmake b/machines/pleiades-has/pleiades-has.cmake
similarity index 100%
rename from machines/cmake_macros/pleiades-has.cmake
rename to machines/pleiades-has/pleiades-has.cmake
diff --git a/machines/pleiades-ivy/config_batch.xml b/machines/pleiades-ivy/config_batch.xml
new file mode 100644
index 00000000..b90e68ae
--- /dev/null
+++ b/machines/pleiades-ivy/config_batch.xml
@@ -0,0 +1,15 @@
+
+
+ -W group_list=$PROJECT
+
+
+ -l select={{ num_nodes }}:ncpus={{ max_tasks_per_node }}:mpiprocs={{ tasks_per_node }}:ompthreads={{ thread_count }}:model=ivy
+ -l place=scatter:excl
+ -S {{ shell }}
+ -V
+
+
+ normal
+ devel
+
+
diff --git a/machines/cmake_macros/pleiades-ivy.cmake b/machines/pleiades-ivy/pleiades-ivy.cmake
similarity index 100%
rename from machines/cmake_macros/pleiades-ivy.cmake
rename to machines/pleiades-ivy/pleiades-ivy.cmake
diff --git a/machines/pleiades-san/config_batch.xml b/machines/pleiades-san/config_batch.xml
new file mode 100644
index 00000000..11882c02
--- /dev/null
+++ b/machines/pleiades-san/config_batch.xml
@@ -0,0 +1,18 @@
+
+
+
+
+ -W group_list=$PROJECT
+
+
+ -l select={{ num_nodes }}:ncpus={{ max_tasks_per_node }}:mpiprocs={{ tasks_per_node }}:ompthreads={{ thread_count }}:model=san
+ -l place=scatter:excl
+ -S {{ shell }}
+ -V
+
+
+ normal
+ devel
+
+
+
diff --git a/machines/cmake_macros/pleiades-san.cmake b/machines/pleiades-san/pleiades-san.cmake
similarity index 100%
rename from machines/cmake_macros/pleiades-san.cmake
rename to machines/pleiades-san/pleiades-san.cmake
diff --git a/machines/cmake_macros/intel_sandiatoss3.cmake b/machines/sandiatoss3/intel_sandiatoss3.cmake
similarity index 100%
rename from machines/cmake_macros/intel_sandiatoss3.cmake
rename to machines/sandiatoss3/intel_sandiatoss3.cmake
diff --git a/machines/stampede2-knl/config_batch.xml b/machines/stampede2-knl/config_batch.xml
new file mode 100644
index 00000000..25aa6609
--- /dev/null
+++ b/machines/stampede2-knl/config_batch.xml
@@ -0,0 +1,12 @@
+
+ ssh stampede2.tacc.utexas.edu cd $CASEROOT ; sbatch
+
+ --time $JOB_WALLCLOCK_TIME
+ -p $JOB_QUEUE
+ --account $PROJECT
+
+
+ normal
+ development
+
+
diff --git a/machines/cmake_macros/intel_stampede2-knl.cmake b/machines/stampede2-knl/intel_stampede2-knl.cmake
similarity index 100%
rename from machines/cmake_macros/intel_stampede2-knl.cmake
rename to machines/stampede2-knl/intel_stampede2-knl.cmake
diff --git a/machines/cmake_macros/stampede2-knl.cmake b/machines/stampede2-knl/stampede2-knl.cmake
similarity index 100%
rename from machines/cmake_macros/stampede2-knl.cmake
rename to machines/stampede2-knl/stampede2-knl.cmake
diff --git a/machines/stampede2-skx/config_batch.xml b/machines/stampede2-skx/config_batch.xml
new file mode 100644
index 00000000..1bfd6bf1
--- /dev/null
+++ b/machines/stampede2-skx/config_batch.xml
@@ -0,0 +1,13 @@
+
+ ssh stampede2.tacc.utexas.edu cd $CASEROOT ; sbatch
+
+ --time $JOB_WALLCLOCK_TIME
+ -p $JOB_QUEUE
+ --account $PROJECT
+
+
+ skx-normal
+ skx-dev
+
+
+
diff --git a/machines/cmake_macros/intel_stampede2-skx.cmake b/machines/stampede2-skx/intel_stampede2-skx.cmake
similarity index 100%
rename from machines/cmake_macros/intel_stampede2-skx.cmake
rename to machines/stampede2-skx/intel_stampede2-skx.cmake
diff --git a/machines/cmake_macros/stampede2-skx.cmake b/machines/stampede2-skx/stampede2-skx.cmake
similarity index 100%
rename from machines/cmake_macros/stampede2-skx.cmake
rename to machines/stampede2-skx/stampede2-skx.cmake
diff --git a/machines/theia/config_batch.xml b/machines/theia/config_batch.xml
new file mode 100644
index 00000000..e6f66cd9
--- /dev/null
+++ b/machines/theia/config_batch.xml
@@ -0,0 +1,16 @@
+
+
+ sbatch
+
+ --time $JOB_WALLCLOCK_TIME
+ -q $JOB_QUEUE
+ --account $PROJECT
+
+
+ --partition=theia
+
+
+ batch
+
+
+
diff --git a/machines/cmake_macros/intel_theia.cmake b/machines/theia/intel_theia.cmake
similarity index 100%
rename from machines/cmake_macros/intel_theia.cmake
rename to machines/theia/intel_theia.cmake
diff --git a/machines/theta/config_batch.xml b/machines/theta/config_batch.xml
new file mode 100644
index 00000000..f4e59724
--- /dev/null
+++ b/machines/theta/config_batch.xml
@@ -0,0 +1,5 @@
+
+
+ default
+
+
diff --git a/machines/cmake_macros/theta.cmake b/machines/theta/theta.cmake
similarity index 100%
rename from machines/cmake_macros/theta.cmake
rename to machines/theta/theta.cmake
diff --git a/machines/thunder/config_batch.xml b/machines/thunder/config_batch.xml
new file mode 100644
index 00000000..f713bec4
--- /dev/null
+++ b/machines/thunder/config_batch.xml
@@ -0,0 +1,15 @@
+
+
+ sbatch
+
+ --time $JOB_WALLCLOCK_TIME
+ -q $JOB_QUEUE
+
+
+ --ntasks-per-node=64
+ --hint=nomultithread
+
+
+ regular
+
+
diff --git a/machines/cmake_macros/ubuntu-latest.cmake b/machines/ubuntu-latest/ubuntu-latest.cmake
similarity index 100%
rename from machines/cmake_macros/ubuntu-latest.cmake
rename to machines/ubuntu-latest/ubuntu-latest.cmake
diff --git a/machines/zeus/config_batch.xml b/machines/zeus/config_batch.xml
new file mode 100644
index 00000000..7aa84edb
--- /dev/null
+++ b/machines/zeus/config_batch.xml
@@ -0,0 +1,17 @@
+
+
+ -env
+
+ -q $JOB_QUEUE
+ -W $JOB_WALLCLOCK_TIME
+ -P $PROJECT
+
+
+ -R "span[ptile={{ tasks_per_node }}]"
+
+
+ p_short
+ p_medium
+ p_long
+
+
diff --git a/machines/cmake_macros/intel_zeus.cmake b/machines/zeus/intel_zeus.cmake
similarity index 100%
rename from machines/cmake_macros/intel_zeus.cmake
rename to machines/zeus/intel_zeus.cmake
diff --git a/machines/cmake_macros/zeus.cmake b/machines/zeus/zeus.cmake
similarity index 100%
rename from machines/cmake_macros/zeus.cmake
rename to machines/zeus/zeus.cmake
diff --git a/maps_mct.xml b/maps_mct.xml
deleted file mode 100644
index 0364d5bf..00000000
--- a/maps_mct.xml
+++ /dev/null
@@ -1,1220 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/modelgrid_aliases_mct.xml b/modelgrid_aliases_mct.xml
deleted file mode 100644
index 890b2b86..00000000
--- a/modelgrid_aliases_mct.xml
+++ /dev/null
@@ -1,1261 +0,0 @@
-
-
-
-
-
- null
- null
- null
- null
- rx1
- r05
- r05
- rx1
- r05
- r05
- null
- gris4
- gris4
- null
- ww3a
- ww3a
- ww3a
- null
-
-
-
- gx1v6
- gx1v6
- gx1v6
- Non-standard grid for testing of the interpolation in DATM rather than coupler
-
-
-
- gx1v7
- gx1v7
- gx1v7
- Non-standard grid for testing of the interpolation in DATM rather than coupler
-
-
-
- 01col
- 01col
- Non-standard grid for running POP in true 1D mode
-
-
-
- CLM_USRDAT
- CLM_USRDAT
- null
-
-
-
- 1x1_numaIA
- 1x1_numaIA
- null
-
-
-
- 1x1_brazil
- 1x1_brazil
- null
-
-
-
- 1x1_smallvilleIA
- 1x1_smallvilleIA
- null
-
-
-
- 1x1_camdenNJ
- 1x1_camdenNJ
- null
-
-
-
- 1x1_mexicocityMEX
- 1x1_mexicocityMEX
- null
-
-
-
- 1x1_vancouverCAN
- 1x1_vancouverCAN
- null
-
-
-
- 1x1_urbanc_alpha
- 1x1_urbanc_alpha
- null
-
-
-
- 5x5_amazon
- 5x5_amazon
- null
- 5x5_amazon
-
-
-
-
- 0.125nldas2
- 0.125nldas2
- 0.125nldas2
- 0.125nldas2
- 0.125nldas2
-
-
-
- 360x720cru
- 360x720cru
- tx0.1v3
- tx0.1v3
-
-
-
-
-
- T31
- T31
- gx3v7
- gx3v7
-
-
-
- T31
- T31
- gx3v7
- gris4
- gx3v7
-
-
-
- T31
- T31
- gx3v7
- gris4
- gx3v7
-
-
-
- T31
- T31
- gx3v7
- gris20
- gx3v7
-
-
-
- T31
- T31
- gx3v7
- gris20
- gx3v7
-
-
-
- T42
- T42
- T42
- gx1v7
-
-
-
- T42
- T42
- T42
- gx1v6
-
-
-
- T42
- T42
- T42
- gx1v7
-
-
-
- T5
- T5
- T5
- gx3v7
-
-
-
- T85
- T85
- T85
- gx1v6
-
-
-
- T85
- T85
- T85
- gx1v7
-
-
-
- T85
- 0.9x1.25
- tx0.1v2
- tx0.1v2
-
-
-
- T341
- 0.23x0.31
- tx0.1v2
- tx0.1v2
-
-
-
- T62
- T62
- gx3v7
- gx3v7
-
-
-
- T62
- T62
- tx1v1
- tx1v1
-
-
-
- T62
- T62
- tn1v3
- tn1v3
-
-
-
- T62
- T62
- tn0.25v3
- tn0.25v3
-
-
-
- T62
- T62
- tx0.1v2
- tx0.1v2
-
-
-
- T62
- T62
- tx0.1v3
- tx0.1v3
-
-
-
- TL319
- TL319
- gx1v7
- JRA025v2
- gx1v7
-
-
-
- TL319
- TL319
- gx1v7
- JRA025v2
- gx1v7
- gx1v7
-
-
-
- TL319
- TL319
- gx1v7
- JRA025
- gx1v7
-
-
-
- TL319
- TL319
- tx0.66v1
- JRA025
-
-
-
- TL319
- TL319
- tx0.66v1
- JRA025
- tx0.66v1
-
-
-
- TL319
- TL319
- tx0.1v2
- JRA025
-
-
-
- TL319
- TL319
- tx0.1v3
- JRA025v2
-
-
-
- TL319
- TL319
- tx0.1v3
- JRA025
-
-
-
- TL639
- TL639
- gx1v7
-
- gx1v7
-
-
-
- TL639
- TL639
- tx0.66v1
-
-
-
-
- T62
- T62
- tx0.66v1
-
-
-
- T62
- T62
- tx0.66v1
- tx0.66v1
-
-
-
- T62
- T62
- tx0.25v1
-
-
- 0.9x1.25
- 0.9x1.25
- tx0.66v1
-
-
-
- T62
- T62
- gx1v6
- gx1v6
-
-
-
- T62
- T62
- gx1v7
- gx1v7
-
-
-
- T62
- T62
- gx1v7
- gx1v7
- gx1v7
-
-
-
- T62
- T62
- oQU120
- oQU120
-
-
-
-
-
- 0.23x0.31
- 0.23x0.31
- gx1v6
- gx1v6
-
-
-
- 0.23x0.31
- 0.23x0.31
- gx1v7
- gx1v7
-
-
-
- 0.23x0.31
- 0.23x0.31
- tn1v3
- tn1v3
-
-
-
- 0.23x0.31
- 0.23x0.31
- tn0.25v3
- tn0.25v3
-
-
-
- 0.23x0.31
- 0.23x0.31
- tx0.1v2
- tx0.1v2
-
-
-
- 0.47x0.63
- 0.47x0.63
- gx1v6
- gx1v6
-
-
-
- 0.47x0.63
- 0.47x0.63
- gx1v7
- gx1v7
-
-
-
- 0.47x0.63
- 0.47x0.63
- tn0.25v3
- tn0.25v3
-
-
-
- 0.47x0.63
- 0.47x0.63
- tx0.1v2
- tx0.1v2
-
-
-
- 0.9x1.25
- 0.9x1.25
- gx1v6
- gx1v6
-
-
-
- 0.9x1.25
- 0.9x1.25
- gx1v7
- gx1v7
-
-
-
- 0.9x1.25
- 0.9x1.25
- tn1v3
- tn1v3
-
-
-
- 0.9x1.25
- 0.9x1.25
- tn0.25v3
- tn0.25v3
-
-
-
- 0.9x1.25
- 0.9x1.25
- gx1v7
- gris4
- gx1v7
-
-
-
- 0.9x1.25
- 0.9x1.25
- gx1v7
- gris4
- gx1v7
-
-
-
- 0.9x1.25
- 0.9x1.25
- gx1v7
- ais8
- gx1v7
-
-
-
- 0.9x1.25
- 0.9x1.25
- gx1v7
- ais8:gris4
- gx1v7
-
-
-
- 0.9x1.25
- 0.9x1.25
- gx1v7
- gris20
- gx1v7
-
-
-
- 0.9x1.25
- 0.9x1.25
- gx1v7
- gris20
- gx1v7
-
-
-
- 0.9x1.25
- 0.9x1.25
- 0.9x1.25
- null
-
-
-
- 0.9x1.25
- 0.9x1.25
- 0.9x1.25
- gx1v6
-
-
-
- 0.9x1.25
- 0.9x1.25
- 0.9x1.25
- gx1v7
-
-
-
- 0.47x0.63
- 0.47x0.63
- 0.47x0.63
- gx1v7
-
-
-
- 1.9x2.5
- 1.9x2.5
- gx1v6
- gx1v6
-
-
-
- 1.9x2.5
- 1.9x2.5
- gx1v7
- gx1v7
-
-
-
- 1.9x2.5
- 1.9x2.5
- gx1v6
- r01
- gx1v6
-
-
-
- 1.9x2.5
- 1.9x2.5
- gx1v7
- r01
- gx1v7
-
-
-
- 1.9x2.5
- 1.9x2.5
- gx1v7
- r05
- gx1v7
-
-
-
- 1.9x2.5
- 1.9x2.5
- gx1v7
- gris4
- gx1v7
-
-
-
- 1.9x2.5
- 1.9x2.5
- gx1v7
- gris4
- gx1v7
-
-
-
- 1.9x2.5
- 1.9x2.5
- 1.9x2.5
- gx1v6
-
-
-
- 1.9x2.5
- 1.9x2.5
- 1.9x2.5
- gx1v6
-
-
-
- 1.9x2.5
- 1.9x2.5
- 1.9x2.5
- null
-
-
-
- 1.9x2.5
- 1.9x2.5
- 1.9x2.5
- gx1v7
-
-
-
- 4x5
- 4x5
- gx3v7
- gx3v7
-
-
-
- 0.23x0.31
- 0.23x0.31
- 0.23x0.31
- gx1v6
-
-
-
- 0.23x0.31
- 0.23x0.31
- 0.23x0.31
- gx1v7
-
-
-
- 2.5x3.33
- 2.5x3.33
- 2.5x3.33
- gx1v6
-
-
-
- 2.5x3.33
- 2.5x3.33
- 2.5x3.33
- gx1v7
-
-
-
- 4x5
- 4x5
- 4x5
- gx3v7
-
-
-
- 10x15
- 10x15
- 10x15
- gx3v7
-
-
-
- 10x15
- 10x15
- 10x15
- ais8
- gx3v7
-
-
-
- 10x15
- 10x15
- 10x15
- ais8:gris4
- gx3v7
-
-
-
- 10x15
- 10x15
- 10x15
- usgs
-
-
-
- 10x15
- 10x15
- gx3v7
- gx3v7
-
-
-
-
-
- ne5np4
- ne5np4
- ne5np4
- gx3v7
-
-
-
- ne16np4
- ne16np4
- gx1v7
- gx1v7
-
-
-
- ne16np4
- ne16np4
- ne16np4
- gx1v7
-
-
-
- ne30np4
- ne30np4
- gx1v6
- gx1v6
-
-
-
- ne30np4
- ne30np4
- gx1v7
- gx1v7
-
-
-
- ne30np4
- ne30np4
- tn0.25v3
- tn0.25v3
-
-
-
- ne30np4.pg3
- ne30np4.pg3
- gx1v7
- gx1v7
-
-
-
- ne30np4
- 1.9x2.5
- gx1v6
- For testing tri-grid
- gx1v6
-
-
-
- ne30np4
- 1.9x2.5
- gx1v7
- For testing tri-grid
- gx1v7
-
-
-
- ne30np4
- 0.9x1.25
- gx1v6
- For testing tri-grid
- gx1v6
-
-
-
- ne30np4
- 0.9x1.25
- gx1v7
- For testing tri-grid
- gx1v7
-
-
-
- ne30np4
- ne30np4
- ne30np4
- gx1v6
-
-
-
- ne30np4
- ne30np4
- ne30np4
- gx1v7
-
-
-
- ne60np4
- ne60np4
- gx1v6
- gx1v6
-
-
-
- ne60np4
- ne60np4
- gx1v7
- gx1v7
-
-
-
- ne60np4
- ne60np4
- tn0.25v3
- tn0.25v3
-
-
-
- ne60np4
- ne60np4
- ne60np4
- gx1v6
-
-
-
- ne120np4
- ne120np4
- gx1v6
- gx1v6
-
-
-
- ne120np4
- ne120np4
- gx1v7
- gx1v7
-
-
-
- ne120np4
- ne120np4
- tx0.1v2
- tx0.1v2
-
-
-
- ne120np4
- ne120np4
- ne120np4
- gx1v6
-
-
-
- ne120np4
- ne120np4
- ne120np4
- gx1v7
-
-
-
- ne240np4
- 0.23x0.31
- gx1v6
- For testing high resolution tri-grid
- gx1v6
-
-
-
- ne240np4
- 0.23x0.31
- gx1v7
- For testing high resolution tri-grid
- gx1v7
-
-
-
- ne240np4
- ne240np4
- tx0.1v2
- tx0.1v2
-
-
-
- ne240np4
- ne240np4
- ne240np4
- gx1v6
-
-
-
- ne240np4
- ne240np4
- ne240np4
- gx1v7
-
-
-
-
-
- ne5np4.pg2
- ne5np4.pg2
- ne5np4.pg2
- gx3v7
-
-
-
- ne30np4.pg2
- ne30np4.pg2
- ne30np4.pg2
- gx1v7
-
-
-
- ne60np4.pg2
- ne60np4.pg2
- ne60np4.pg2
- gx1v7
-
-
-
- ne120np4.pg2
- ne120np4.pg2
- ne120np4.pg2
- gx1v7
-
-
-
- ne120np4.pg2
- ne120np4.pg2
- ne120np4.pg2
- tx0.1v2
-
-
-
- ne240np4.pg2
- ne240np4.pg2
- ne240np4.pg2
- gx1v7
-
-
-
-
-
- ne5np4.pg3
- ne5np4.pg3
- ne5np4.pg3
- gx3v7
-
-
-
- ne16np4.pg3
- ne16np4.pg3
- ne16np4.pg3
- gx1v7
-
-
-
- ne30np4.pg3
- ne30np4.pg3
- ne30np4.pg3
- gx1v7
-
-
-
- ne60np4.pg3
- ne60np4.pg3
- ne60np4.pg3
- gx1v7
-
-
-
- ne120np4.pg3
- ne120np4.pg3
- ne120np4.pg3
- gx1v7
-
-
-
- ne120np4.pg3
- ne120np4.pg3
- ne120np4.pg3
- tx0.1v3
-
-
-
- ne240np4.pg3
- ne240np4.pg3
- ne240np4.pg3
- gx1v7
-
-
-
- ne120np4.pg3
- ne120np4.pg3
- gx1v7
- gx1v7
-
-
-
- ne120np4.pg3
- ne120np4.pg3
- gx1v7
- tx0.1v3
-
-
-
-
-
- ne5np4.pg4
- ne5np4.pg4
- ne5np4.pg4
- gx3v7
-
-
-
- ne30np4.pg4
- ne30np4.pg4
- ne30np4.pg4
- gx1v7
-
-
-
- ne60np4.pg4
- ne60np4.pg4
- ne60np4.pg4
- gx1v7
-
-
-
- ne120np4.pg4
- ne120np4.pg4
- ne120np4.pg4
- gx1v7
-
-
-
-
-
- ne0np4CONUS.ne30x8
- ne0np4CONUS.ne30x8
- gx1v7
- gx1v7
-
-
-
- ne0np4CONUS.ne30x8
- ne0np4CONUS.ne30x8
- ne0np4CONUS.ne30x8
- gx1v7
-
-
-
- ne0np4TESTONLY.ne5x4
- ne0np4TESTONLY.ne5x4
- ne0np4TESTONLY.ne5x4
- gx3v7
-
-
-
- ne0np4CONUS.ne30x8
- ne0np4CONUS.ne30x8
- ne0np4CONUS.ne30x8
- tx0.1v2
-
-
-
- ne0np4.ARCTIC.ne30x4
- ne0np4.ARCTIC.ne30x4
- ne0np4.ARCTIC.ne30x4
- tx0.1v2
-
-
-
- ne0np4.ARCTICGRIS.ne30x8
- ne0np4.ARCTICGRIS.ne30x8
- ne0np4.ARCTICGRIS.ne30x8
- tx0.1v2
-
-
-
-
-
- mpasa480
- mpasa480
- mpasa480
- gx1v7
-
-
-
- mpasa120
- mpasa120
- mpasa120
- gx1v7
-
-
-
- mpasa60
- mpasa60
- mpasa60
- gx1v7
-
-
-
- mpasa30
- mpasa30
- mpasa30
- gx1v7
-
-
-
- mpasa15
- mpasa15
- mpasa15
- gx1v7
-
-
-
- mpasa12
- mpasa12
- mpasa12
- gx1v7
-
-
-
- mpasa15-3conus
- mpasa15-3conus
- mpasa15-3conus
- gx1v7
-
-
-
-
-
- T31
- T31
- gx3v7
- gx3v7
-
-
-
- 4x5
- 4x5
- gx3v7
- gx3v7
-
-
-
- 1.9x2.5
- 1.9x2.5
- gx1v6
- gx1v6
-
-
-
- 1.9x2.5
- 1.9x2.5
- gx1v7
- gx1v7
-
-
-
- ne30np4
- ne30np4
- gx1v6
- gx1v6
-
-
-
- ne30np4
- ne30np4
- gx1v7
- gx1v7
-
-
-
- C24
- C24
- C24
- gx1v7
-
-
-
- C48
- C48
- C48
- gx1v7
-
-
-
- C96
- C96
- C96
- gris4
- gx1v7
-
-
-
- C96
- C96
- C96
- tx0.66v1
-
-
-
- C96
- C96
- tx0.66v1
- tx0.66v1
-
-
-
- C96
- C96
- tx0.25v1
- tx0.25v1
-
-
-
- C192
- C192
- C192
- gx1v7
-
-
-
-
- C384
- C384
- C384
- gx1v7
-
-
-
- C384
- C384
- tx0.25v1
- tx0.25v1
-
-
-
-
- ww3a
-
-
-
diff --git a/modelgrid_aliases_nuopc.xml b/modelgrid_aliases_nuopc.xml
index 23019a6b..49e02d2d 100644
--- a/modelgrid_aliases_nuopc.xml
+++ b/modelgrid_aliases_nuopc.xml
@@ -19,9 +19,9 @@
gris4
gris4
null
- ww3a
- ww3a
- ww3a
+ wg37
+ wg37
+ wg37
null
@@ -878,6 +878,7 @@
ne30np4.pg3
gx1v7
ais8:gris4
+ wgx3v7
gx1v7
@@ -885,6 +886,7 @@
ne30np4.pg3
ne30np4.pg3
tx2_3v2
+ wgx3v7
tx2_3v2
@@ -892,6 +894,7 @@
ne30np4.pg3
ne30np4.pg3
tx2_3v2
+ wgx3v7
tx2_3v2