Skip to content

Commit

Permalink
Make stochastic physics independent of fv3atm and its submodules (NOA…
Browse files Browse the repository at this point in the history 
…A-EMC#171)

* Update CMakeLists.txt to build stochastic_physics
* Update gnumake build to include stochastic_physics wrapper
* Update gnumake build config for macosx.gnu to work with new NCEPLIBS and downgraded FMS
* Update submodule pointer for fv3atm
* Regression test logs for orion.intel, hera.intel, hera.gnu
* Rename rt_stampede_cheyenne.conf to rt_stampede.conf, add rt_cheyenne.conf for cheyenne.intel from NCAR dtc/develop branch
* Regression test logs for wcoss_cray and wcoss_dell_p3
* Revert stochastic_physics change in .gitmodules and update submodule pointer for stochastic_physics
* Revert change to .gitmodules and update submodule pointer for fv3atm
* Revert unintential addition of tests/rt_stochy_ca.conf
  • Loading branch information
@climbfuji
climbfuji authored Aug 6, 2020
1 parent 6e4972b commit 92564f8
Show file tree
Hide file tree
Showing 12 changed files with 551 additions and 448 deletions.
5 changes: 5 additions & 0 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,11 @@ set_target_properties(fms PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BI
set_target_properties(fms PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/FMS/mod)
target_include_directories(fms PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/FMS/mod>)

###############################################################################
### stochastic_physics
###############################################################################
add_subdirectory(stochastic_physics)

###############################################################################
### FV3
###############################################################################
Expand Down
2 changes: 1 addition & 1 deletion FV3
Submodule FV3 updated 10 files
+7 −0 .github/CODEOWNERS
+56 −0 .github/ISSUE_TEMPLATE/bug_report.md
+32 −0 .github/ISSUE_TEMPLATE/feature_request.md
+37 −0 .github/pull_request_template.md
+2 −1 CMakeLists.txt
+5 −67 atmos_model.F90
+6 −4 makefile
+13 −56 stochastic_physics/CMakeLists.txt
+54 −0 stochastic_physics/makefile
+249 −0 stochastic_physics/stochastic_physics_wrapper.F90
10 changes: 9 additions & 1 deletion conf/configure.fv3.macosx.gnu
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,14 @@ MULTI_GASES = N
include $(ESMFMKFILE)
ESMF_INC = $(ESMF_F90COMPILEPATHS)

# New NCEPLIBS
NEMSIO_INC=$(NEMSIO_ROOT)/include
NEMSIO_LIB=$(NEMSIO_ROOT)/lib/libnemsio.a
BACIO_LIB4=$(BACIO_ROOT)/lib/libbacio_4.a
SP_LIBd=$(SP_ROOT)/lib/libsp_d.a
W3EMC_LIBd=$(W3EMC_ROOT)/lib/libw3emc_d.a
W3NCO_LIBd=$(W3NCO_ROOT)/lib/libw3nco_d.a
#
NEMSIOINC = -I$(NEMSIO_INC)
NCEPLIBS = $(NEMSIO_LIB) $(BACIO_LIB4) $(SP_LIBd) $(W3EMC_LIBd) $(W3NCO_LIBd)

Expand Down Expand Up @@ -91,7 +99,7 @@ CFLAGS := $(INCLUDE)
FFLAGS := $(INCLUDE) -fcray-pointer -ffree-line-length-none -fno-range-check -fbacktrace

CPPDEFS += -DMACOSX -Duse_libMPI -Duse_netCDF -DSPMD -DUSE_LOG_DIAG_FIELD_INFO -DUSE_GFSL63 -DGFS_PHYS -Duse_WRTCOMP
CPPDEFS += -DNEW_TAUCTMAX -DINTERNAL_FILE_NML -DNO_INLINE_POST
CPPDEFS += -DNEW_TAUCTMAX -DINTERNAL_FILE_NML -DNO_INLINE_POST -DHAVE_GETTID

ifeq ($(HYDRO),Y)
CPPDEFS +=
Expand Down
2 changes: 1 addition & 1 deletion stochastic_physics
Submodule stochastic_physics updated from 12a4dc to a8e2cc
62 changes: 31 additions & 31 deletions tests/RegressionTests_hera.gnu.log
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Wed Aug 5 13:07:19 UTC 2020
Wed Aug 5 19:55:54 UTC 2020
Start Regression test


baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20200805/GNU/fv3_gfdlmp_ccpp
working dir = /scratch1/NCEPDEV/stmp2/Dusan.Jovic/FV3_RT/rt_247246/fv3_ccpp_gfdlmp_prod
baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20200806/GNU/fv3_gfdlmp_ccpp
working dir = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_247447/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 = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20200805/GNU/fv3_gfs_v15p2_ccpp
working dir = /scratch1/NCEPDEV/stmp2/Dusan.Jovic/FV3_RT/rt_247246/fv3_ccpp_gfs_v15p2_prod
baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20200806/GNU/fv3_gfs_v15p2_ccpp
working dir = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_247447/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 = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20200805/GNU/fv3_gfs_v16beta_ccpp
working dir = /scratch1/NCEPDEV/stmp2/Dusan.Jovic/FV3_RT/rt_247246/fv3_ccpp_gfs_v16beta_prod
baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20200806/GNU/fv3_gfs_v16beta_ccpp
working dir = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_247447/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 = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20200805/GNU/fv3_gfs_v16beta_flake_ccpp
working dir = /scratch1/NCEPDEV/stmp2/Dusan.Jovic/FV3_RT/rt_247246/fv3_ccpp_gfs_v16beta_flake_prod
baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20200806/GNU/fv3_gfs_v16beta_flake_ccpp
working dir = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_247447/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 = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20200805/GNU/fv3_rrtmgp_ccpp
working dir = /scratch1/NCEPDEV/stmp2/Dusan.Jovic/FV3_RT/rt_247246/fv3_ccpp_rrtmgp_prod
baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20200806/GNU/fv3_rrtmgp_ccpp
working dir = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_247447/fv3_ccpp_rrtmgp_prod
Checking test 005 fv3_ccpp_rrtmgp results ....
Comparing atmos_4xdaily.tile1.nc .........OK
Comparing atmos_4xdaily.tile2.nc .........OK
Expand Down Expand Up @@ -322,8 +322,8 @@ Checking test 005 fv3_ccpp_rrtmgp results ....
Test 005 fv3_ccpp_rrtmgp PASS


baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20200805/GNU/fv3_gsd_ccpp
working dir = /scratch1/NCEPDEV/stmp2/Dusan.Jovic/FV3_RT/rt_247246/fv3_ccpp_gsd_prod
baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20200806/GNU/fv3_gsd_ccpp
working dir = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_247447/fv3_ccpp_gsd_prod
Checking test 006 fv3_ccpp_gsd 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_gsd results ....
Test 006 fv3_ccpp_gsd PASS


baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20200805/GNU/fv3_thompson_ccpp
working dir = /scratch1/NCEPDEV/stmp2/Dusan.Jovic/FV3_RT/rt_247246/fv3_ccpp_thompson_prod
baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20200806/GNU/fv3_thompson_ccpp
working dir = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_247447/fv3_ccpp_thompson_prod
Checking test 007 fv3_ccpp_thompson 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 results ....
Test 007 fv3_ccpp_thompson PASS


baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20200805/GNU/fv3_thompson_no_aero_ccpp
working dir = /scratch1/NCEPDEV/stmp2/Dusan.Jovic/FV3_RT/rt_247246/fv3_ccpp_thompson_no_aero_prod
baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20200806/GNU/fv3_thompson_no_aero_ccpp
working dir = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_247447/fv3_ccpp_thompson_no_aero_prod
Checking test 008 fv3_ccpp_thompson_no_aero results ....
Comparing atmos_4xdaily.tile1.nc .........OK
Comparing atmos_4xdaily.tile2.nc .........OK
Expand Down Expand Up @@ -550,8 +550,8 @@ Checking test 008 fv3_ccpp_thompson_no_aero results ....
Test 008 fv3_ccpp_thompson_no_aero PASS


baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20200805/GNU/fv3_rrfs_v1beta_ccpp
working dir = /scratch1/NCEPDEV/stmp2/Dusan.Jovic/FV3_RT/rt_247246/fv3_ccpp_rrfs_v1beta_prod
baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20200806/GNU/fv3_rrfs_v1beta_ccpp
working dir = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_247447/fv3_ccpp_rrfs_v1beta_prod
Checking test 009 fv3_ccpp_rrfs_v1beta results ....
Comparing atmos_4xdaily.tile1.nc .........OK
Comparing atmos_4xdaily.tile2.nc .........OK
Expand Down Expand Up @@ -642,14 +642,14 @@ Checking test 009 fv3_ccpp_rrfs_v1beta results ....
Test 009 fv3_ccpp_rrfs_v1beta PASS


baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20200805/GNU/fv3_control_ccpp
working dir = /scratch1/NCEPDEV/stmp2/Dusan.Jovic/FV3_RT/rt_247246/fv3_ccpp_control_debug_prod
baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20200806/GNU/fv3_control_ccpp
working dir = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_247447/fv3_ccpp_control_debug_prod
Checking test 010 fv3_ccpp_control_debug results ....
Test 010 fv3_ccpp_control_debug PASS


baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20200805/GNU/fv3_gfs_v15p2_debug_ccpp
working dir = /scratch1/NCEPDEV/stmp2/Dusan.Jovic/FV3_RT/rt_247246/fv3_ccpp_gfs_v15p2_debug_prod
baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20200806/GNU/fv3_gfs_v15p2_debug_ccpp
working dir = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_247447/fv3_ccpp_gfs_v15p2_debug_prod
Checking test 011 fv3_ccpp_gfs_v15p2_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_v15p2_debug results ....
Test 011 fv3_ccpp_gfs_v15p2_debug PASS


baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20200805/GNU/fv3_gfs_v16beta_debug_ccpp
working dir = /scratch1/NCEPDEV/stmp2/Dusan.Jovic/FV3_RT/rt_247246/fv3_ccpp_gfs_v16beta_debug_prod
baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20200806/GNU/fv3_gfs_v16beta_debug_ccpp
working dir = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_247447/fv3_ccpp_gfs_v16beta_debug_prod
Checking test 012 fv3_ccpp_gfs_v16beta_debug results ....
Comparing atmos_4xdaily.tile1.nc .........OK
Comparing atmos_4xdaily.tile2.nc .........OK
Expand Down Expand Up @@ -784,8 +784,8 @@ Checking test 012 fv3_ccpp_gfs_v16beta_debug results ....
Test 012 fv3_ccpp_gfs_v16beta_debug PASS


baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20200805/GNU/fv3_rrtmgp_debug_ccpp
working dir = /scratch1/NCEPDEV/stmp2/Dusan.Jovic/FV3_RT/rt_247246/fv3_ccpp_rrtmgp_debug_prod
baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20200806/GNU/fv3_rrtmgp_debug_ccpp
working dir = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_247447/fv3_ccpp_rrtmgp_debug_prod
Checking test 013 fv3_ccpp_rrtmgp_debug results ....
Comparing atmos_4xdaily.tile1.nc .........OK
Comparing atmos_4xdaily.tile2.nc .........OK
Expand Down Expand Up @@ -852,8 +852,8 @@ Checking test 013 fv3_ccpp_rrtmgp_debug results ....
Test 013 fv3_ccpp_rrtmgp_debug PASS


baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20200805/GNU/fv3_multigases_ccpp
working dir = /scratch1/NCEPDEV/stmp2/Dusan.Jovic/FV3_RT/rt_247246/fv3_ccpp_multigases_prod
baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20200806/GNU/fv3_multigases_ccpp
working dir = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_247447/fv3_ccpp_multigases_prod
Checking test 014 fv3_ccpp_multigases results ....
Comparing atmos_4xdaily.tile1.nc .........OK
Comparing atmos_4xdaily.tile2.nc .........OK
Expand Down Expand Up @@ -927,5 +927,5 @@ Test 014 fv3_ccpp_multigases PASS


REGRESSION TEST WAS SUCCESSFUL
Wed Aug 5 13:38:21 UTC 2020
Elapsed time: 00h:31m:03s. Have a nice day!
Wed Aug 5 20:31:05 UTC 2020
Elapsed time: 00h:35m:12s. Have a nice day!
Loading

0 comments on commit 92564f8

Please sign in to comment.