Skip to content

Commit

Permalink
Merge NCAR feature/transition-to-capgen-1 (prepare for cap_gen.py, st…
Browse files Browse the repository at this point in the history 
…ep 1) to develop (NOAA-EMC#216)

Preparation for transitioning to the next-generation code generator of the ccpp-framework (cap_gen.py).
  • Loading branch information
@climbfuji
climbfuji committed Oct 9, 2020
1 parent 2190530 commit b00a11f
Show file tree
Hide file tree
Showing 8 changed files with 353 additions and 353 deletions.
2 changes: 1 addition & 1 deletion FV3
Submodule FV3 updated 60 files
+1 −1 ccpp/framework
+1 −1 ccpp/physics
+9 −20 ccpp/suites/suite.xsd
+1 −1 ccpp/suites/suite_FV3_CPT_v0.xml
+1 −1 ccpp/suites/suite_FV3_GFS_2017.xml
+1 −1 ccpp/suites/suite_FV3_GFS_2017_coupled.xml
+1 −1 ccpp/suites/suite_FV3_GFS_2017_couplednsst.xml
+1 −1 ccpp/suites/suite_FV3_GFS_2017_csawmg.xml
+1 −1 ccpp/suites/suite_FV3_GFS_2017_csawmgshoc.xml
+1 −1 ccpp/suites/suite_FV3_GFS_2017_fv3wam.xml
+1 −1 ccpp/suites/suite_FV3_GFS_2017_gfdlmp.xml
+1 −1 ccpp/suites/suite_FV3_GFS_2017_gfdlmp_noahmp.xml
+1 −1 ccpp/suites/suite_FV3_GFS_2017_gfdlmp_regional.xml
+1 −1 ccpp/suites/suite_FV3_GFS_2017_gfdlmp_regional_c768.xml
+1 −1 ccpp/suites/suite_FV3_GFS_2017_h2ophys.xml
+1 −1 ccpp/suites/suite_FV3_GFS_2017_myj.xml
+1 −1 ccpp/suites/suite_FV3_GFS_2017_ntiedtke.xml
+1 −1 ccpp/suites/suite_FV3_GFS_2017_ozphys_2015.xml
+1 −1 ccpp/suites/suite_FV3_GFS_2017_sas.xml
+1 −1 ccpp/suites/suite_FV3_GFS_2017_satmedmf.xml
+1 −1 ccpp/suites/suite_FV3_GFS_2017_satmedmf_coupled.xml
+1 −1 ccpp/suites/suite_FV3_GFS_2017_satmedmfq.xml
+1 −1 ccpp/suites/suite_FV3_GFS_2017_shinhong.xml
+1 −1 ccpp/suites/suite_FV3_GFS_2017_stretched.xml
+1 −1 ccpp/suites/suite_FV3_GFS_2017_ysu.xml
+1 −1 ccpp/suites/suite_FV3_GFS_cpld_rasmgshoc.xml
+1 −1 ccpp/suites/suite_FV3_GFS_cpld_rasmgshocnsst.xml
+1 −1 ccpp/suites/suite_FV3_GFS_cpldnst_rasmgshoc.xml
+1 −1 ccpp/suites/suite_FV3_GFS_rasmgshoc.xml
+1 −1 ccpp/suites/suite_FV3_GFS_v15.xml
+1 −1 ccpp/suites/suite_FV3_GFS_v15_gf.xml
+1 −1 ccpp/suites/suite_FV3_GFS_v15_gf_thompson.xml
+1 −1 ccpp/suites/suite_FV3_GFS_v15_mynn.xml
+1 −1 ccpp/suites/suite_FV3_GFS_v15_ras.xml
+1 −1 ccpp/suites/suite_FV3_GFS_v15_rasmgshoc.xml
+1 −1 ccpp/suites/suite_FV3_GFS_v15_thompson.xml
+1 −1 ccpp/suites/suite_FV3_GFS_v15_thompson_mynn.xml
+1 −1 ccpp/suites/suite_FV3_GFS_v15p2.xml
+1 −1 ccpp/suites/suite_FV3_GFS_v15p2_RRTMGP.xml
+1 −1 ccpp/suites/suite_FV3_GFS_v15p2_coupled.xml
+1 −1 ccpp/suites/suite_FV3_GFS_v15p2_no_nsst.xml
+1 −1 ccpp/suites/suite_FV3_GFS_v15plus.xml
+1 −1 ccpp/suites/suite_FV3_GFS_v15plusras.xml
+1 −1 ccpp/suites/suite_FV3_GFS_v16_csawmg.xml
+1 −1 ccpp/suites/suite_FV3_GFS_v16beta.xml
+1 −1 ccpp/suites/suite_FV3_GFS_v16beta_RRTMGP.xml
+1 −1 ccpp/suites/suite_FV3_GFS_v16beta_flake.xml
+1 −1 ccpp/suites/suite_FV3_GFS_v16beta_no_nsst.xml
+1 −1 ccpp/suites/suite_FV3_GSD_SAR.xml
+1 −1 ccpp/suites/suite_FV3_GSD_noah.xml
+1 −1 ccpp/suites/suite_FV3_GSD_noah_mynnsfc.xml
+1 −1 ccpp/suites/suite_FV3_GSD_v0.xml
+1 −1 ccpp/suites/suite_FV3_GSD_v0_drag_suite.xml
+1 −1 ccpp/suites/suite_FV3_GSD_v0_mynnsfc.xml
+1 −1 ccpp/suites/suite_FV3_HAFS_ferhires_update_moist.xml
+1 −1 ccpp/suites/suite_FV3_HRRR.xml
+1 −1 ccpp/suites/suite_FV3_RAP.xml
+1 −1 ccpp/suites/suite_FV3_RRFS_v1beta.xml
+36 −18 gfsphysics/GFS_layer/GFS_typedefs.F90
+1,243 −952 gfsphysics/GFS_layer/GFS_typedefs.meta
54 changes: 27 additions & 27 deletions tests/RegressionTests_cheyenne.gnu.log
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Wed Sep 23 16:39:24 MDT 2020
Wed Oct 7 16:12:13 MDT 2020
Start Regression test


baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20200923/GNU/fv3_gfdlmp_ccpp
working dir = /glade/scratch/heinzell/FV3_RT/rt_68881/fv3_ccpp_gfdlmp_prod
baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20200929/GNU/fv3_gfdlmp_ccpp
working dir = /glade/scratch/heinzell/FV3_RT/rt_18854/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 @@ -50,8 +50,8 @@ Checking test 001 fv3_ccpp_gfdlmp results ....
Test 001 fv3_ccpp_gfdlmp PASS


baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20200923/GNU/fv3_gfs_v15p2_ccpp
working dir = /glade/scratch/heinzell/FV3_RT/rt_68881/fv3_ccpp_gfs_v15p2_prod
baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20200929/GNU/fv3_gfs_v15p2_ccpp
working dir = /glade/scratch/heinzell/FV3_RT/rt_18854/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 @@ -118,8 +118,8 @@ Checking test 002 fv3_ccpp_gfs_v15p2 results ....
Test 002 fv3_ccpp_gfs_v15p2 PASS


baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20200923/GNU/fv3_gfs_v16beta_ccpp
working dir = /glade/scratch/heinzell/FV3_RT/rt_68881/fv3_ccpp_gfs_v16beta_prod
baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20200929/GNU/fv3_gfs_v16beta_ccpp
working dir = /glade/scratch/heinzell/FV3_RT/rt_18854/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 @@ -186,8 +186,8 @@ Checking test 003 fv3_ccpp_gfs_v16beta results ....
Test 003 fv3_ccpp_gfs_v16beta PASS


baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20200923/GNU/fv3_gfs_v16beta_flake_ccpp
working dir = /glade/scratch/heinzell/FV3_RT/rt_68881/fv3_ccpp_gfs_v16beta_flake_prod
baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20200929/GNU/fv3_gfs_v16beta_flake_ccpp
working dir = /glade/scratch/heinzell/FV3_RT/rt_18854/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 @@ -254,8 +254,8 @@ Checking test 004 fv3_ccpp_gfs_v16beta_flake results ....
Test 004 fv3_ccpp_gfs_v16beta_flake PASS


baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20200923/GNU/fv3_gsd_ccpp
working dir = /glade/scratch/heinzell/FV3_RT/rt_68881/fv3_ccpp_gsd_prod
baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20200929/GNU/fv3_gsd_ccpp
working dir = /glade/scratch/heinzell/FV3_RT/rt_18854/fv3_ccpp_gsd_prod
Checking test 005 fv3_ccpp_gsd results ....
Comparing atmos_4xdaily.tile1.nc .........OK
Comparing atmos_4xdaily.tile2.nc .........OK
Expand Down Expand Up @@ -346,8 +346,8 @@ Checking test 005 fv3_ccpp_gsd results ....
Test 005 fv3_ccpp_gsd PASS


baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20200923/GNU/fv3_thompson_ccpp
working dir = /glade/scratch/heinzell/FV3_RT/rt_68881/fv3_ccpp_thompson_prod
baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20200929/GNU/fv3_thompson_ccpp
working dir = /glade/scratch/heinzell/FV3_RT/rt_18854/fv3_ccpp_thompson_prod
Checking test 006 fv3_ccpp_thompson results ....
Comparing atmos_4xdaily.tile1.nc .........OK
Comparing atmos_4xdaily.tile2.nc .........OK
Expand Down Expand Up @@ -414,8 +414,8 @@ Checking test 006 fv3_ccpp_thompson results ....
Test 006 fv3_ccpp_thompson PASS


baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20200923/GNU/fv3_thompson_no_aero_ccpp
working dir = /glade/scratch/heinzell/FV3_RT/rt_68881/fv3_ccpp_thompson_no_aero_prod
baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20200929/GNU/fv3_thompson_no_aero_ccpp
working dir = /glade/scratch/heinzell/FV3_RT/rt_18854/fv3_ccpp_thompson_no_aero_prod
Checking test 007 fv3_ccpp_thompson_no_aero results ....
Comparing atmos_4xdaily.tile1.nc .........OK
Comparing atmos_4xdaily.tile2.nc .........OK
Expand Down Expand Up @@ -482,8 +482,8 @@ Checking test 007 fv3_ccpp_thompson_no_aero results ....
Test 007 fv3_ccpp_thompson_no_aero PASS


baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20200923/GNU/fv3_rrfs_v1beta_ccpp
working dir = /glade/scratch/heinzell/FV3_RT/rt_68881/fv3_ccpp_rrfs_v1beta_prod
baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20200929/GNU/fv3_rrfs_v1beta_ccpp
working dir = /glade/scratch/heinzell/FV3_RT/rt_18854/fv3_ccpp_rrfs_v1beta_prod
Checking test 008 fv3_ccpp_rrfs_v1beta results ....
Comparing atmos_4xdaily.tile1.nc .........OK
Comparing atmos_4xdaily.tile2.nc .........OK
Expand Down Expand Up @@ -574,14 +574,14 @@ Checking test 008 fv3_ccpp_rrfs_v1beta results ....
Test 008 fv3_ccpp_rrfs_v1beta PASS


baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20200923/GNU/fv3_control_ccpp
working dir = /glade/scratch/heinzell/FV3_RT/rt_68881/fv3_ccpp_control_debug_prod
baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20200929/GNU/fv3_control_ccpp
working dir = /glade/scratch/heinzell/FV3_RT/rt_18854/fv3_ccpp_control_debug_prod
Checking test 009 fv3_ccpp_control_debug results ....
Test 009 fv3_ccpp_control_debug PASS


baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20200923/GNU/fv3_gfs_v15p2_debug_ccpp
working dir = /glade/scratch/heinzell/FV3_RT/rt_68881/fv3_ccpp_gfs_v15p2_debug_prod
baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20200929/GNU/fv3_gfs_v15p2_debug_ccpp
working dir = /glade/scratch/heinzell/FV3_RT/rt_18854/fv3_ccpp_gfs_v15p2_debug_prod
Checking test 010 fv3_ccpp_gfs_v15p2_debug results ....
Comparing atmos_4xdaily.tile1.nc .........OK
Comparing atmos_4xdaily.tile2.nc .........OK
Expand Down Expand Up @@ -648,8 +648,8 @@ Checking test 010 fv3_ccpp_gfs_v15p2_debug results ....
Test 010 fv3_ccpp_gfs_v15p2_debug PASS


baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20200923/GNU/fv3_gfs_v16beta_debug_ccpp
working dir = /glade/scratch/heinzell/FV3_RT/rt_68881/fv3_ccpp_gfs_v16beta_debug_prod
baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20200929/GNU/fv3_gfs_v16beta_debug_ccpp
working dir = /glade/scratch/heinzell/FV3_RT/rt_18854/fv3_ccpp_gfs_v16beta_debug_prod
Checking test 011 fv3_ccpp_gfs_v16beta_debug results ....
Comparing atmos_4xdaily.tile1.nc .........OK
Comparing atmos_4xdaily.tile2.nc .........OK
Expand Down Expand Up @@ -716,8 +716,8 @@ Checking test 011 fv3_ccpp_gfs_v16beta_debug results ....
Test 011 fv3_ccpp_gfs_v16beta_debug PASS


baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20200923/GNU/fv3_multigases_ccpp
working dir = /glade/scratch/heinzell/FV3_RT/rt_68881/fv3_ccpp_multigases_prod
baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20200929/GNU/fv3_multigases_ccpp
working dir = /glade/scratch/heinzell/FV3_RT/rt_18854/fv3_ccpp_multigases_prod
Checking test 012 fv3_ccpp_multigases results ....
Comparing atmos_4xdaily.tile1.nc .........OK
Comparing atmos_4xdaily.tile2.nc .........OK
Expand Down Expand Up @@ -791,5 +791,5 @@ Test 012 fv3_ccpp_multigases PASS


REGRESSION TEST WAS SUCCESSFUL
Wed Sep 23 17:03:55 MDT 2020
Elapsed time: 00h:24m:32s. Have a nice day!
Wed Oct 7 16:28:37 MDT 2020
Elapsed time: 00h:16m:25s. Have a nice day!
Loading

0 comments on commit b00a11f

Please sign in to comment.