Commit 6b0b180 1 parent bd6b113 commit 6b0b180 Copy full SHA for 6b0b180
File tree 4 files changed +20
-16
lines changed
4 files changed +20
-16
lines changed Original file line number Diff line number Diff line change @@ -127,7 +127,7 @@ phases:
127
127
- echo $BUILD_STATUS
128
128
129
129
- cd /build_container
130
- - ecbuild -DSKIP_LARGE_TESTS=ON - DBUNDLE_SKIP_GEOS-AERO=OFF -DBUNDLE_SKIP_ROPP-UFO=OFF /jcsda/fv3-bundle/
130
+ - ecbuild -DBUNDLE_SKIP_GEOS-AERO=OFF -DBUNDLE_SKIP_ROPP-UFO=OFF /jcsda/fv3-bundle/
131
131
- cd fv3-jedi
132
132
- make -j8
133
133
Original file line number Diff line number Diff line change @@ -20,7 +20,7 @@ phases:
20
20
- echo $CODEBUILD_WEBHOOK_EVENT
21
21
- echo $CODEBUILD_WEBHOOK_TRIGGER
22
22
- echo $CODEBUILD_WEBHOOK_BASE_REF
23
-
23
+
24
24
# Codebuild only runs on PUSH events if HEAD_REF
25
25
# is refs/heads/develop (merge to develop). In this
26
26
# case CODEBUILD_GIT_BRANCH="develop"
@@ -135,7 +135,7 @@ phases:
135
135
136
136
# gsw
137
137
- ./clone.sh $GIT_USER $GIT_PASS jcsda-internal/GSW-Fortran $CODEBUILD_GIT_BRANCH gsw /jcsda/fv3-bundle develop
138
-
138
+
139
139
# move CMakeLists.txt
140
140
- cp CMakeLists.txt /jcsda/fv3-bundle
141
141
@@ -157,7 +157,7 @@ phases:
157
157
&& echo $CXX
158
158
&& echo $FC
159
159
&& CC=mpicc CXX=mpicxx FC=mpifort
160
- && cmake -DCMAKE_MODULE_PATH=/usr/local/share/ecbuild/cmake/ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DENABLE_GPROF=ON -DBUNDLE_SKIP_GEOS-AERO=OFF -DBUNDLE_SKIP_ROPP-UFO=OFF -DTEST_TIME_REF_FV3=CTestCostData.txt.awsgnu.test /jcsda/fv3-bundle
160
+ && cmake -DCMAKE_MODULE_PATH=/usr/local/share/ecbuild/cmake/ -DSKIP_LARGE_TESTS=OFF - DCMAKE_BUILD_TYPE=RelWithDebInfo -DENABLE_GPROF=ON -DBUNDLE_SKIP_GEOS-AERO=OFF -DBUNDLE_SKIP_ROPP-UFO=OFF -DTEST_TIME_REF_FV3=CTestCostData.txt.awsgnu.test /jcsda/fv3-bundle
161
161
&& cd fv3-jedi
162
162
&& make -j8"
163
163
Original file line number Diff line number Diff line change @@ -88,7 +88,7 @@ phases:
88
88
89
89
# Set crtm branch name
90
90
- export CRTM_JEDI_BRANCH="v2.3-jedi"
91
-
91
+
92
92
- if [ "$CODEBUILD_GIT_BRANCH" = "develop" ];
93
93
then export CODEBUILD_GIT_BRANCH_FORK="release-stable";
94
94
export CODEBUILD_GIT_BRANCH_CRTM=${CRTM_JEDI_BRANCH};
@@ -182,7 +182,7 @@ phases:
182
182
&& . /opt/intel/compilers_and_libraries/linux/bin/compilervars.sh
183
183
&& cd /build_container
184
184
&& ls
185
- && ecbuild /jcsda/fv3-bundle/ -DBUNDLE_SKIP_GEOS-AERO=OFF -DBUNDLE_SKIP_ROPP-UFO=OFF -DTEST_TIME_REF_FV3=CTestCostData.txt.awsintel.test
185
+ && ecbuild /jcsda/fv3-bundle/ -DSKIP_LARGE_TESTS=OFF - DBUNDLE_SKIP_GEOS-AERO=OFF -DBUNDLE_SKIP_ROPP-UFO=OFF -DTEST_TIME_REF_FV3=CTestCostData.txt.awsintel.test
186
186
&& cd fv3-jedi
187
187
&& make -j8"
188
188
Original file line number Diff line number Diff line change 5
5
6
6
# Option not to run with large tests
7
7
# ----------------------------------
8
- option (SKIP_LARGE_TESTS "Skip tests with more than 6 processors" OFF )
8
+ option (SKIP_LARGE_TESTS "Skip tests with more than 6 processors" ON )
9
9
10
10
# Create the Data/ directory
11
11
# --------------------------
@@ -1021,10 +1021,12 @@ fv3jedi_add_test( NAME hyb-fgat_gfs_aero
1021
1021
1022
1022
# 4DEnVar
1023
1023
# -------
1024
- fv3jedi_add_test( NAME 4denvar
1025
- EXE fv3jedi_var.x
1026
- MPI 18
1027
- TEST_DEPENDS bumpparameters_nicas_gfs )
1024
+ if (NOT SKIP_LARGE_TESTS)
1025
+ fv3jedi_add_test( NAME 4denvar
1026
+ EXE fv3jedi_var.x
1027
+ MPI 18
1028
+ TEST_DEPENDS bumpparameters_nicas_gfs )
1029
+ endif ()
1028
1030
1029
1031
# Hybrid 4DVar
1030
1032
# ------------
@@ -1051,11 +1053,13 @@ fv3jedi_add_test( NAME addincrement_gfs
1051
1053
TOL 1.0e-3 0
1052
1054
TEST_DEPENDS diffstates_gfs )
1053
1055
1054
- fv3jedi_add_test( NAME addincrement_geos
1055
- EXE fv3jedi_addincrement.x
1056
- MPI 12
1057
- TOL 1.0e-4 0
1058
- TEST_DEPENDS diffstates_geos )
1056
+ if (NOT SKIP_LARGE_TESTS)
1057
+ fv3jedi_add_test( NAME addincrement_geos
1058
+ EXE fv3jedi_addincrement.x
1059
+ MPI 12
1060
+ TOL 1.0e-4 0
1061
+ TEST_DEPENDS diffstates_geos )
1062
+ endif ()
1059
1063
1060
1064
# LETKF / LGETKF
1061
1065
# --------------
You can’t perform that action at this time.
0 commit comments