Skip to content

Commit e2268e5

Browse files
authored
Merge branch 'develop' into feature/zhaobin74/cice6-config-upd
2 parents 0456f49 + f48f259 commit e2268e5

File tree

7 files changed

+23
-809
lines changed

7 files changed

+23
-809
lines changed

.github/workflows/spack-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ jobs:
8181
- name: Set default compiler and target
8282
shell: spack-bash {0}
8383
run: |
84-
spack config add 'packages:all:compiler:[[email protected]]'
8584
spack config add 'packages:all:require:target=x86_64_v3'
8685
8786
- name: Create Spack environment
@@ -107,6 +106,7 @@ jobs:
107106
- name: Install
108107
shell: spack-bash {0}
109108
run: |
109+
spack clean -m
110110
spack -e spack-env install --add --no-check-signature --use-buildcache only \
111111
esmf gftl gftl-shared fargparse pflogger pfunit yafyaml ecbuild udunits openblas
112112

GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/Raster/makebcs/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ esma_set_this()
22

33
set (srcs
44
LDAS_DateTimeMod.F90
5-
EASE_conv.F90
65
mod_process_hres_data.F90
76
rasterize.F90
87
read_riveroutlet.F90

0 commit comments

Comments
 (0)