Skip to content

Commit e1bdfb3

Browse files
author
JJ Guerrette
authored
Update to spack-stack-v1/skylab-3.0.0 (#208)
### Description Updates the build to use `spack-stack-v1/skylab-3.0.0` modules on Cheyenne. Currently this only works for GNU, but intel builds are broken with the previous version of spack-stack too. So this does not remove any functionality. ### Issue closed Closes #206 ### Tests completed - [x] 3dvar_OIE120km_WarmStart - [x] 3denvar_OIE120km_WarmStart - [x] 3dvar_OIE120km_ColdStart - [x] 3dvar_O30kmIE60km_ColdStart - [x] 3denvar_O30kmIE60km_WarmStart - [x] eda_OIE120km_WarmStart
1 parent 91c739f commit e1bdfb3

File tree

4 files changed

+29
-4
lines changed

4 files changed

+29
-4
lines changed

config/environmentJEDI.csh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ module use /glade/work/jedipara/cheyenne/spack-stack/modulefiles/misc
1414

1515

1616
if ( "$compilerUsed" =~ *"gnu"* ) then
17-
module use /glade/work/jedipara/cheyenne/spack-stack/spack-stack-v1/envs/skylab-2.0.0-gnu-10.1.0/install/modulefiles/Core
17+
module use /glade/work/jedipara/cheyenne/spack-stack/spack-stack-v1/envs/skylab-3.0.0-gnu-10.1.0/install/modulefiles/Core
1818
module load stack-gcc/10.1.0
1919
module load stack-openmpi/4.1.1
2020
module load jedi-mpas-env/1.0.0
2121

2222
else if ( "$compilerUsed" =~ *"intel"* ) then
23-
module use /glade/work/jedipara/cheyenne/spack-stack/spack-stack-v1/envs/skylab-2.0.0-intel-19.1.1.217/install/modulefiles/Core
23+
module use /glade/work/jedipara/cheyenne/spack-stack/spack-stack-v1/envs/skylab-3.0.0-intel-19.1.1.217/install/modulefiles/Core
2424
module load stack-intel/19.1.1.217
2525
module load stack-intel-mpi/2019.7.217
2626
module load jedi-mpas-env/1.0.0

config/mpas/forecast/stream_list.atmosphere.diagnostics

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,48 +13,64 @@ q2
1313
t2m
1414
th2m
1515
mslp
16+
relhum_50hPa
17+
relhum_100hPa
1618
relhum_200hPa
1719
relhum_250hPa
1820
relhum_500hPa
1921
relhum_700hPa
2022
relhum_850hPa
2123
relhum_925hPa
24+
dewpoint_50hPa
25+
dewpoint_100hPa
2226
dewpoint_200hPa
2327
dewpoint_250hPa
2428
dewpoint_500hPa
2529
dewpoint_700hPa
2630
dewpoint_850hPa
2731
dewpoint_925hPa
32+
temperature_50hPa
33+
temperature_100hPa
2834
temperature_200hPa
2935
temperature_250hPa
3036
temperature_500hPa
3137
temperature_700hPa
3238
temperature_850hPa
3339
temperature_925hPa
40+
height_50hPa
41+
height_100hPa
3442
height_200hPa
3543
height_250hPa
3644
height_500hPa
3745
height_700hPa
3846
height_850hPa
3947
height_925hPa
48+
uzonal_50hPa
49+
uzonal_100hPa
4050
uzonal_200hPa
4151
uzonal_250hPa
4252
uzonal_500hPa
4353
uzonal_700hPa
4454
uzonal_850hPa
4555
uzonal_925hPa
56+
umeridional_50hPa
57+
umeridional_100hPa
4658
umeridional_200hPa
4759
umeridional_250hPa
4860
umeridional_500hPa
4961
umeridional_700hPa
5062
umeridional_850hPa
5163
umeridional_925hPa
64+
w_50hPa
65+
w_100hPa
5266
w_200hPa
5367
w_250hPa
5468
w_500hPa
5569
w_700hPa
5670
w_850hPa
5771
w_925hPa
72+
vorticity_50hPa
73+
vorticity_100hPa
5874
vorticity_200hPa
5975
vorticity_250hPa
6076
vorticity_500hPa

config/mpas/geovars.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,18 @@ fields:
1616
- field name: air_pressure_levels
1717
mpas template field: w
1818

19+
- field name: upward_air_velocity
20+
mpas template field: theta
21+
22+
- field name: geometric_height
23+
mpas template field: theta
24+
1925
- field name: geopotential_height
2026
mpas template field: theta
2127

28+
- field name: geopotential_height_levels
29+
mpas template field: w
30+
2231
- field name: surface_geopotential_height
2332
mpas template field: u10
2433

initialize/framework/Build.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ class Build(Component):
1616
variablesWithDefaults = {
1717
## mpas bundle
1818
# mpas-bundle build directory
19-
'mpas bundle': ['/glade/work/bjung/panda-c/build/mpas-bundle_gnu-openmpi_24FEB2023_single', str],
19+
'mpas bundle': ['/glade/work/guerrett/pandac/build/mpas-bundle_gnu-openmpi_22MAR2023_single', str],
2020

2121
# optional double-precision build
22-
#'mpas bundle': ['/glade/work/bjung/panda-c/build/mpas-bundle_gnu-openmpi_24FEB2023', str],
22+
#'mpas bundle': ['/glade/work/guerrett/pandac/build/mpas-bundle_gnu-openmpi_22MAR2023', str],
2323

2424
## compiler used
2525
# {compiler}-{mpi-implementation}/{version} combination that selects the JEDI module used to build

0 commit comments

Comments
 (0)