Skip to content

Commit

Permalink
Add dependencies to CCPP metadata (#180)
Browse files Browse the repository at this point in the history 
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"
  • Loading branch information
@climbfuji
climbfuji authored Sep 2, 2020
1 parent 63c4889 commit 3fb6556
Show file tree
Hide file tree
Showing 11 changed files with 1,163 additions and 517 deletions.
2 changes: 1 addition & 1 deletion FV3
Submodule FV3 updated 8 files
+4 −3 ccpp/CMakeLists.txt
+21 −169 ccpp/config/ccpp_prebuild_config.py
+1 −1 ccpp/framework
+1 −1 ccpp/physics
+5 −0 gfsphysics/CCPP_layer/CCPP_data.meta
+10 −0 gfsphysics/CCPP_layer/CCPP_typedefs.meta
+3 −0 gfsphysics/GFS_layer/GFS_typedefs.F90
+371 −3 gfsphysics/GFS_layer/GFS_typedefs.meta
7 changes: 5 additions & 2 deletions cmake/GNU.cmake
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@

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

if(${CMAKE_Fortran_COMPILER_VERSION} VERSION_GREATER_EQUAL 10)
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fallow-argument-mismatch -fallow-invalid-boz")
endif()

if(DEBUG)
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")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -O0 -ggdb")
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -O0 -ggdb -fno-unsafe-math-optimizations -frounding-math -fsignaling-nans -ffpe-trap=invalid,zero,overflow -fbounds-check")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O0 -ggdb")
add_definitions(-DDEBUG)
elseif(REPRO)
if (APPLE)
Expand Down
38 changes: 19 additions & 19 deletions tests/RegressionTests_cheyenne.gnu.log
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Mon Aug 31 14:38:38 MDT 2020
Tue Sep 1 11:09:45 MDT 2020
Start Regression test


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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

0 comments on commit 3fb6556

Please sign in to comment.