Skip to content

Commit

Permalink
Merge pull request NCAR#33 from NCAR/scm_integration
Browse files Browse the repository at this point in the history
merge scm_integration into master
  • Loading branch information
grantfirl authored Mar 22, 2018
2 parents c8cd924 + bfa1a46 commit 4cddc33
Show file tree
Hide file tree
Showing 10 changed files with 413 additions and 367 deletions.
Empty file added .gitmodules
Empty file.
4 changes: 2 additions & 2 deletions cmake/FindOpenMP_Fortran.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ SET (OpenMP_Fortran_FLAG_CANDIDATES
#Microsoft Visual Studio
"/openmp"
#Intel windows
"/Qopenmp"
"/Qopenmp"
#Intel
"-openmp"
"-qopenmp"
#Gnu
"-fopenmp"
#Empty, if compiler automatically accepts openmp
Expand Down
100 changes: 100 additions & 0 deletions examples/suite_scm_GFS_test.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
<?xml version="1.0" encoding="UTF-8"?>

<suite name="GFS_operational_2017" lib="gfsphysics" ver="0.0.1">
<init>GFS_initialize_scm_run</init>
<ipd part="1">
<subcycle loop="1">
<scheme>GFS_phys_time_vary_1_run</scheme>
<scheme>GFS_rad_time_vary_run</scheme>
<scheme>GFS_phys_time_vary_2_run</scheme>
<!-- <scheme>GFS_diagtoscreen_run</scheme> -->
</subcycle>
</ipd>
<ipd part="2">
<subcycle loop="1">
<scheme>GFS_suite_interstitial_rad_reset_run</scheme>
<scheme>GFS_rrtmg_pre_run</scheme>
<scheme>rrtmg_sw_pre_run</scheme>
<scheme>rrtmg_sw_run</scheme>
<scheme>rrtmg_sw_post_run</scheme>
<scheme>rrtmg_lw_pre_run</scheme>
<scheme>rrtmg_lw_run</scheme>
<scheme>rrtmg_lw_post_run</scheme>
<scheme>GFS_rrtmg_post_run</scheme>
<!-- <scheme>GFS_diagtoscreen_run</scheme> -->
<!-- <scheme>GFS_interstitialtoscreen_run</scheme> -->
</subcycle>
</ipd>
<ipd part="3">
<subcycle loop="1">
<scheme>GFS_suite_interstitial_phys_reset_run</scheme>
<scheme>get_prs_fv3_run</scheme>
<scheme>GFS_suite_interstitial_1_run</scheme>
<scheme>sfc_sice_pre_run</scheme>
<scheme>dcyc2t3_run</scheme>
<scheme>GFS_suite_interstitial_2_run</scheme>
<scheme>GFS_surface_generic_pre_run</scheme>
<scheme>GFS_PBL_generic_pre_run</scheme>
<scheme>lsm_noah_pre_run</scheme>
<!-- DH* TODO - turn into a subsycle loop="2" construct? -->
<!-- Surface iteration loop 1 -->
<scheme>GFS_surface_loop_control_part0_run</scheme>
<scheme>sfc_ex_coef_run</scheme>
<scheme>GFS_surface_loop_control_part1_run</scheme>
<scheme>sfc_nst_pre_run</scheme>
<scheme>sfc_nst_run</scheme>
<scheme>sfc_nst_post_run</scheme>
<scheme>lsm_noah_run</scheme>
<scheme>sfc_sice_run</scheme>
<scheme>GFS_surface_loop_control_part2_run</scheme>
<!-- Surface iteration loop 2 -->
<scheme>GFS_surface_loop_control_part0_run</scheme>
<scheme>sfc_ex_coef_run</scheme>
<scheme>GFS_surface_loop_control_part1_run</scheme>
<scheme>sfc_nst_pre_run</scheme>
<scheme>sfc_nst_run</scheme>
<scheme>sfc_nst_post_run</scheme>
<scheme>lsm_noah_run</scheme>
<scheme>sfc_sice_run</scheme>
<scheme>GFS_surface_loop_control_part2_run</scheme>
<!-- End of surface iteration loop -->
<scheme>dcyc2t3_post_run</scheme>
<scheme>sfc_diag_run</scheme>
<scheme>GFS_surface_generic_post_run</scheme>
<scheme>edmf_run</scheme>
<scheme>GFS_PBL_generic_post_run</scheme>
<scheme>gwdps_pre_run</scheme>
<scheme>gwdps_run</scheme>
<scheme>gwdps_post_run</scheme>
<scheme>rayleigh_damp_run</scheme>
<scheme>GFS_suite_update_stateout_run</scheme>
<scheme>ozphys_run</scheme>
<scheme>ozphys_post_run</scheme>
<scheme>GFS_DCNV_generic_pre_run</scheme>
<scheme>get_phi_fv3_run</scheme>
<scheme>GFS_suite_interstitial_3_run</scheme>
<scheme>GFS_zhao_carr_pre_run</scheme>
<scheme>sasas_deep_run</scheme>
<scheme>GFS_DCNV_generic_post_run</scheme>
<scheme>gwdc_pre_run</scheme>
<scheme>gwdc_run</scheme>
<scheme>gwdc_post_run</scheme>
<scheme>GFS_SCNV_generic_pre_run</scheme>
<scheme>sasas_shal_run</scheme>
<scheme>sasas_shal_post_run</scheme>
<scheme>GFS_SCNV_generic_post_run</scheme>
<scheme>cnvc90_run</scheme>
<scheme>GFS_MP_generic_pre_run</scheme>
<scheme>zhaocarr_gscond_run</scheme>
<scheme>zhaocarr_precpd_run</scheme>
<scheme>GFS_calpreciptype_run</scheme>
<scheme>GFS_MP_generic_post_run</scheme>
<scheme>sfc_diag_run</scheme>
<scheme>lsm_noah_post_run</scheme>
<scheme>sfc_sice_post_run</scheme>
<!-- <scheme>GFS_diagtoscreen_run</scheme> -->
<!-- <scheme>GFS_interstitialtoscreen_run</scheme> -->
</subcycle>
</ipd>
<!-- <finalize>IPD_finalize</finalize> -->
</suite>
14 changes: 0 additions & 14 deletions schemes/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,3 @@ ExternalProject_Add(
-DCCPP_MKCAP=${CMAKE_CURRENT_SOURCE_DIR}/mkcap.py
)

#------------------------------------------------------------------------------
# The dummy SCM scheme
ExternalProject_Add(
scm
DEPENDS ccpp
SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/scm"
PREFIX "scm"
DOWNLOAD_COMMAND ""
UPDATE_COMMAND ""
INSTALL_COMMAND ""
CMAKE_ARGS -DCCPP_INCLUDE_DIRS=${CCPP_INCLUDE_DIRS}
-DCCPP_LIB_DIRS=${CCPP_LIB_DIRS}
-DCCPP_MKCAP=${CMAKE_CURRENT_SOURCE_DIR}/mkcap.py
)
115 changes: 0 additions & 115 deletions schemes/scm/CMakeLists.txt

This file was deleted.

66 changes: 0 additions & 66 deletions schemes/scm/scheme.xml

This file was deleted.

41 changes: 0 additions & 41 deletions schemes/scm/scm.f90

This file was deleted.

Loading

0 comments on commit 4cddc33

Please sign in to comment.