Skip to content

Commit 3fb6556

Browse files
climbfujiclimbfuji
authored
Add dependencies to CCPP metadata (ufs-community#180)
Add the capability to specify dependencies for CCPP modules/DDTs/schemes in the scheme metadata. This allows us to remove the DDT/scheme dependency information from the CCPP prebuild config in fv3atm and only compile the dependencies and schemes that are used by the selected suite definition files. Until now, all schemes and scheme dependencies are compiled, regardless whether they are in use in any of the selected suites. Add compiler flags for gfortran-10 Don't run csawmg tests on Cheyenne, both crash with a "bus error"
1 parent 63c4889 commit 3fb6556

11 files changed

+1163
-517
lines changed

‎FV3

‎cmake/GNU.cmake

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11

22
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fcray-pointer -ffree-line-length-none -fno-range-check -fbacktrace")
33

4+
if(${CMAKE_Fortran_COMPILER_VERSION} VERSION_GREATER_EQUAL 10)
5+
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fallow-argument-mismatch -fallow-invalid-boz")
6+
endif()
47

58
if(DEBUG)
6-
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -Wall -O0 -ggdb -fno-unsafe-math-optimizations -frounding-math -fsignaling-nans -ffpe-trap=invalid,zero,overflow -fbounds-check")
7-
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -O0 -ggdb")
9+
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -O0 -ggdb -fno-unsafe-math-optimizations -frounding-math -fsignaling-nans -ffpe-trap=invalid,zero,overflow -fbounds-check")
10+
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O0 -ggdb")
811
add_definitions(-DDEBUG)
912
elseif(REPRO)
1013
if (APPLE)

‎tests/RegressionTests_cheyenne.gnu.log

+19-19
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
Mon Aug 31 14:38:38 MDT 2020
1+
Tue Sep 1 11:09:45 MDT 2020
22
Start Regression test
33

44

55
baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20200825/GNU/fv3_gfdlmp_ccpp
6-
working dir = /glade/scratch/heinzell/FV3_RT/rt_43399/fv3_ccpp_gfdlmp_prod
6+
working dir = /glade/scratch/heinzell/FV3_RT/rt_3967/fv3_ccpp_gfdlmp_prod
77
Checking test 001 fv3_ccpp_gfdlmp results ....
88
Comparing atmos_4xdaily.tile1.nc .........OK
99
Comparing atmos_4xdaily.tile2.nc .........OK
@@ -51,7 +51,7 @@ Test 001 fv3_ccpp_gfdlmp PASS
5151

5252

5353
baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20200825/GNU/fv3_gfs_v15p2_ccpp
54-
working dir = /glade/scratch/heinzell/FV3_RT/rt_43399/fv3_ccpp_gfs_v15p2_prod
54+
working dir = /glade/scratch/heinzell/FV3_RT/rt_3967/fv3_ccpp_gfs_v15p2_prod
5555
Checking test 002 fv3_ccpp_gfs_v15p2 results ....
5656
Comparing atmos_4xdaily.tile1.nc .........OK
5757
Comparing atmos_4xdaily.tile2.nc .........OK
@@ -119,7 +119,7 @@ Test 002 fv3_ccpp_gfs_v15p2 PASS
119119

120120

121121
baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20200825/GNU/fv3_gfs_v16beta_ccpp
122-
working dir = /glade/scratch/heinzell/FV3_RT/rt_43399/fv3_ccpp_gfs_v16beta_prod
122+
working dir = /glade/scratch/heinzell/FV3_RT/rt_3967/fv3_ccpp_gfs_v16beta_prod
123123
Checking test 003 fv3_ccpp_gfs_v16beta results ....
124124
Comparing atmos_4xdaily.tile1.nc .........OK
125125
Comparing atmos_4xdaily.tile2.nc .........OK
@@ -187,7 +187,7 @@ Test 003 fv3_ccpp_gfs_v16beta PASS
187187

188188

189189
baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20200825/GNU/fv3_gfs_v16beta_flake_ccpp
190-
working dir = /glade/scratch/heinzell/FV3_RT/rt_43399/fv3_ccpp_gfs_v16beta_flake_prod
190+
working dir = /glade/scratch/heinzell/FV3_RT/rt_3967/fv3_ccpp_gfs_v16beta_flake_prod
191191
Checking test 004 fv3_ccpp_gfs_v16beta_flake results ....
192192
Comparing atmos_4xdaily.tile1.nc .........OK
193193
Comparing atmos_4xdaily.tile2.nc .........OK
@@ -255,7 +255,7 @@ Test 004 fv3_ccpp_gfs_v16beta_flake PASS
255255

256256

257257
baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20200825/GNU/fv3_gfs_v15p2_RRTMGP_ccpp
258-
working dir = /glade/scratch/heinzell/FV3_RT/rt_43399/fv3_ccpp_gfs_v15p2_RRTMGP_prod
258+
working dir = /glade/scratch/heinzell/FV3_RT/rt_3967/fv3_ccpp_gfs_v15p2_RRTMGP_prod
259259
Checking test 005 fv3_ccpp_gfs_v15p2_RRTMGP results ....
260260
Comparing atmos_4xdaily.tile1.nc .........OK
261261
Comparing atmos_4xdaily.tile2.nc .........OK
@@ -323,7 +323,7 @@ Test 005 fv3_ccpp_gfs_v15p2_RRTMGP PASS
323323

324324

325325
baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20200825/GNU/fv3_gfs_v16beta_RRTMGP_ccpp
326-
working dir = /glade/scratch/heinzell/FV3_RT/rt_43399/fv3_ccpp_gfs_v16beta_RRTMGP_prod
326+
working dir = /glade/scratch/heinzell/FV3_RT/rt_3967/fv3_ccpp_gfs_v16beta_RRTMGP_prod
327327
Checking test 006 fv3_ccpp_gfs_v16beta_RRTMGP results ....
328328
Comparing atmos_4xdaily.tile1.nc .........OK
329329
Comparing atmos_4xdaily.tile2.nc .........OK
@@ -391,7 +391,7 @@ Test 006 fv3_ccpp_gfs_v16beta_RRTMGP PASS
391391

392392

393393
baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20200825/GNU/fv3_gsd_ccpp
394-
working dir = /glade/scratch/heinzell/FV3_RT/rt_43399/fv3_ccpp_gsd_prod
394+
working dir = /glade/scratch/heinzell/FV3_RT/rt_3967/fv3_ccpp_gsd_prod
395395
Checking test 007 fv3_ccpp_gsd results ....
396396
Comparing atmos_4xdaily.tile1.nc .........OK
397397
Comparing atmos_4xdaily.tile2.nc .........OK
@@ -483,7 +483,7 @@ Test 007 fv3_ccpp_gsd PASS
483483

484484

485485
baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20200825/GNU/fv3_thompson_ccpp
486-
working dir = /glade/scratch/heinzell/FV3_RT/rt_43399/fv3_ccpp_thompson_prod
486+
working dir = /glade/scratch/heinzell/FV3_RT/rt_3967/fv3_ccpp_thompson_prod
487487
Checking test 008 fv3_ccpp_thompson results ....
488488
Comparing atmos_4xdaily.tile1.nc .........OK
489489
Comparing atmos_4xdaily.tile2.nc .........OK
@@ -551,7 +551,7 @@ Test 008 fv3_ccpp_thompson PASS
551551

552552

553553
baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20200825/GNU/fv3_thompson_no_aero_ccpp
554-
working dir = /glade/scratch/heinzell/FV3_RT/rt_43399/fv3_ccpp_thompson_no_aero_prod
554+
working dir = /glade/scratch/heinzell/FV3_RT/rt_3967/fv3_ccpp_thompson_no_aero_prod
555555
Checking test 009 fv3_ccpp_thompson_no_aero results ....
556556
Comparing atmos_4xdaily.tile1.nc .........OK
557557
Comparing atmos_4xdaily.tile2.nc .........OK
@@ -619,7 +619,7 @@ Test 009 fv3_ccpp_thompson_no_aero PASS
619619

620620

621621
baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20200825/GNU/fv3_rrfs_v1beta_ccpp
622-
working dir = /glade/scratch/heinzell/FV3_RT/rt_43399/fv3_ccpp_rrfs_v1beta_prod
622+
working dir = /glade/scratch/heinzell/FV3_RT/rt_3967/fv3_ccpp_rrfs_v1beta_prod
623623
Checking test 010 fv3_ccpp_rrfs_v1beta results ....
624624
Comparing atmos_4xdaily.tile1.nc .........OK
625625
Comparing atmos_4xdaily.tile2.nc .........OK
@@ -711,13 +711,13 @@ Test 010 fv3_ccpp_rrfs_v1beta PASS
711711

712712

713713
baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20200825/GNU/fv3_control_ccpp
714-
working dir = /glade/scratch/heinzell/FV3_RT/rt_43399/fv3_ccpp_control_debug_prod
714+
working dir = /glade/scratch/heinzell/FV3_RT/rt_3967/fv3_ccpp_control_debug_prod
715715
Checking test 011 fv3_ccpp_control_debug results ....
716716
Test 011 fv3_ccpp_control_debug PASS
717717

718718

719719
baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20200825/GNU/fv3_gfs_v15p2_debug_ccpp
720-
working dir = /glade/scratch/heinzell/FV3_RT/rt_43399/fv3_ccpp_gfs_v15p2_debug_prod
720+
working dir = /glade/scratch/heinzell/FV3_RT/rt_3967/fv3_ccpp_gfs_v15p2_debug_prod
721721
Checking test 012 fv3_ccpp_gfs_v15p2_debug results ....
722722
Comparing atmos_4xdaily.tile1.nc .........OK
723723
Comparing atmos_4xdaily.tile2.nc .........OK
@@ -785,7 +785,7 @@ Test 012 fv3_ccpp_gfs_v15p2_debug PASS
785785

786786

787787
baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20200825/GNU/fv3_gfs_v16beta_debug_ccpp
788-
working dir = /glade/scratch/heinzell/FV3_RT/rt_43399/fv3_ccpp_gfs_v16beta_debug_prod
788+
working dir = /glade/scratch/heinzell/FV3_RT/rt_3967/fv3_ccpp_gfs_v16beta_debug_prod
789789
Checking test 013 fv3_ccpp_gfs_v16beta_debug results ....
790790
Comparing atmos_4xdaily.tile1.nc .........OK
791791
Comparing atmos_4xdaily.tile2.nc .........OK
@@ -853,7 +853,7 @@ Test 013 fv3_ccpp_gfs_v16beta_debug PASS
853853

854854

855855
baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20200825/GNU/fv3_gfs_v15p2_RRTMGP_debug_ccpp
856-
working dir = /glade/scratch/heinzell/FV3_RT/rt_43399/fv3_ccpp_gfs_v15p2_RRTMGP_debug_prod
856+
working dir = /glade/scratch/heinzell/FV3_RT/rt_3967/fv3_ccpp_gfs_v15p2_RRTMGP_debug_prod
857857
Checking test 014 fv3_ccpp_gfs_v15p2_RRTMGP_debug results ....
858858
Comparing atmos_4xdaily.tile1.nc .........OK
859859
Comparing atmos_4xdaily.tile2.nc .........OK
@@ -921,7 +921,7 @@ Test 014 fv3_ccpp_gfs_v15p2_RRTMGP_debug PASS
921921

922922

923923
baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20200825/GNU/fv3_gfs_v16beta_RRTMGP_debug_ccpp
924-
working dir = /glade/scratch/heinzell/FV3_RT/rt_43399/fv3_ccpp_gfs_v16beta_RRTMGP_debug_prod
924+
working dir = /glade/scratch/heinzell/FV3_RT/rt_3967/fv3_ccpp_gfs_v16beta_RRTMGP_debug_prod
925925
Checking test 015 fv3_ccpp_gfs_v16beta_RRTMGP_debug results ....
926926
Comparing atmos_4xdaily.tile1.nc .........OK
927927
Comparing atmos_4xdaily.tile2.nc .........OK
@@ -989,7 +989,7 @@ Test 015 fv3_ccpp_gfs_v16beta_RRTMGP_debug PASS
989989

990990

991991
baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20200825/GNU/fv3_multigases_ccpp
992-
working dir = /glade/scratch/heinzell/FV3_RT/rt_43399/fv3_ccpp_multigases_prod
992+
working dir = /glade/scratch/heinzell/FV3_RT/rt_3967/fv3_ccpp_multigases_prod
993993
Checking test 016 fv3_ccpp_multigases results ....
994994
Comparing atmos_4xdaily.tile1.nc .........OK
995995
Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1063,5 +1063,5 @@ Test 016 fv3_ccpp_multigases PASS
10631063

10641064

10651065
REGRESSION TEST WAS SUCCESSFUL
1066-
Mon Aug 31 15:08:20 MDT 2020
1067-
Elapsed time: 00h:29m:42s. Have a nice day!
1066+
Tue Sep 1 11:27:59 MDT 2020
1067+
Elapsed time: 00h:18m:15s. Have a nice day!

0 commit comments

Comments
 (0)