forked from NCAR/ccpp-physics
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request NCAR#9 from climbfuji/update_gsd_develop_from_develop
gsd/develop: update from develop
- Loading branch information
Showing
45 changed files
with
1,447 additions
and
359 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,4 @@ | ||
| *.o | ||
| *.mod | ||
| *.a | ||
| *.pyc |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,12 @@ | ||
| [submodule "atmos_cubed_sphere"] | ||
| path = atmos_cubed_sphere | ||
| url = https://github.com/noaa-gsd/GFDL_atmos_cubed_sphere | ||
| url = https://github.com/NOAA-GSD/GFDL_atmos_cubed_sphere | ||
| branch = gsd/develop | ||
| [submodule "ccpp/framework"] | ||
| path = ccpp/framework | ||
| url = https://github.com/noaa-gsd/ccpp-framework | ||
| url = https://github.com/NOAA-GSD/ccpp-framework | ||
| branch = gsd/develop | ||
| [submodule "ccpp/physics"] | ||
| path = ccpp/physics | ||
| url = https://github.com/noaa-gsd/ccpp-physics | ||
| url = https://github.com/NOAA-GSD/ccpp-physics | ||
| branch = gsd/develop |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,130 @@ | ||
| if( NOT DEFINED PHYS) | ||
| set(PHYS gfs) | ||
| endif() | ||
|
|
||
| if (PHYS MATCHES "nam") | ||
| add_definitions(-DNAM_phys) | ||
| endif() | ||
|
|
||
| if(CCPP) | ||
| add_definitions(-DCCPP) | ||
| if(STATIC) | ||
| add_definitions(-DSTATIC) | ||
| endif() | ||
| endif() | ||
|
|
||
| add_subdirectory(cpl) | ||
| add_subdirectory(${PHYS}physics) | ||
| add_subdirectory(ipd) | ||
| add_subdirectory(io) | ||
|
|
||
| # fv3core library | ||
|
|
||
| if(NOT CCPP) | ||
| set(FAST_PHYSICS_SRCS_F90 atmos_cubed_sphere/model/fv_cmp.F90) | ||
| endif() | ||
|
|
||
| add_library( | ||
| fv3core | ||
|
|
||
| atmos_cubed_sphere/model/a2b_edge.F90 | ||
| atmos_cubed_sphere/model/multi_gases.F90 | ||
| atmos_cubed_sphere/model/boundary.F90 | ||
| atmos_cubed_sphere/model/dyn_core.F90 | ||
| atmos_cubed_sphere/model/fv_arrays.F90 | ||
| ${FAST_PHYSICS_SRCS_F90} | ||
| atmos_cubed_sphere/model/fv_control.F90 | ||
| atmos_cubed_sphere/model/fv_dynamics.F90 | ||
| atmos_cubed_sphere/model/fv_fill.F90 | ||
| atmos_cubed_sphere/model/fv_grid_utils.F90 | ||
| atmos_cubed_sphere/model/fv_mapz.F90 | ||
| atmos_cubed_sphere/model/fv_nesting.F90 | ||
| atmos_cubed_sphere/model/fv_regional_bc.F90 | ||
| atmos_cubed_sphere/model/fv_sg.F90 | ||
| atmos_cubed_sphere/model/fv_tracer2d.F90 | ||
| atmos_cubed_sphere/model/fv_update_phys.F90 | ||
| atmos_cubed_sphere/model/sw_core.F90 | ||
| atmos_cubed_sphere/model/tp_core.F90 | ||
| atmos_cubed_sphere/model/nh_core.F90 | ||
| atmos_cubed_sphere/model/nh_utils.F90 | ||
| atmos_cubed_sphere/tools/external_ic.F90 | ||
| atmos_cubed_sphere/tools/external_sst.F90 | ||
| atmos_cubed_sphere/tools/fv_diagnostics.F90 | ||
| atmos_cubed_sphere/tools/fv_eta.F90 | ||
| atmos_cubed_sphere/tools/fv_grid_tools.F90 | ||
| atmos_cubed_sphere/tools/fv_io.F90 | ||
| atmos_cubed_sphere/tools/fv_mp_mod.F90 | ||
| atmos_cubed_sphere/tools/fv_nudge.F90 | ||
| atmos_cubed_sphere/tools/fv_treat_da_inc.F90 | ||
| atmos_cubed_sphere/tools/fv_iau_mod.F90 | ||
| atmos_cubed_sphere/tools/fv_restart.F90 | ||
| atmos_cubed_sphere/tools/fv_surf_map.F90 | ||
| atmos_cubed_sphere/tools/fv_timing.F90 | ||
| atmos_cubed_sphere//tools/init_hydro.F90 | ||
| atmos_cubed_sphere/tools/sim_nc_mod.F90 | ||
| atmos_cubed_sphere/tools/sorted_index.F90 | ||
| atmos_cubed_sphere/tools/test_cases.F90 | ||
| atmos_cubed_sphere/driver/fvGFS/DYCORE_typedefs.F90 | ||
| atmos_cubed_sphere/driver/fvGFS/fv_nggps_diag.F90 | ||
| atmos_cubed_sphere/driver/fvGFS/atmosphere.F90 | ||
| ) | ||
|
|
||
| set_property(SOURCE atmos_cubed_sphere/model/nh_utils.F90 APPEND_STRING PROPERTY COMPILE_FLAGS "${FAST}") | ||
| set_property(SOURCE atmos_cubed_sphere/model/fv_mapz.F90 APPEND_STRING PROPERTY COMPILE_FLAGS "${FAST}") | ||
|
|
||
| target_link_libraries(fv3core PRIVATE fms) | ||
| target_link_libraries(fv3core PRIVATE ${PHYS}physics) | ||
| target_link_libraries(fv3core PRIVATE ipd) | ||
|
|
||
| target_include_directories(fv3core PRIVATE ${ESMF_MOD}) | ||
|
|
||
| # end of fv3core | ||
|
|
||
| ############################################################################### | ||
| ### ccpp | ||
| ############################################################################### | ||
| if(CCPP) | ||
| add_subdirectory(ccpp) | ||
| add_subdirectory(ccpp/driver) | ||
| add_dependencies(${PHYS}physics ccpp ccppphys) | ||
| add_dependencies(ccppdriver ccpp ccppphys) | ||
| add_dependencies(ccppphys ccpp) | ||
|
|
||
| target_include_directories(fv3core PRIVATE ${CMAKE_BINARY_DIR}/FV3/ccpp/framework/src) | ||
| target_include_directories(fv3core PRIVATE ${CMAKE_BINARY_DIR}/FV3/ccpp/driver) | ||
| endif() | ||
|
|
||
| set_target_properties(fv3core PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/mod) | ||
| target_include_directories(fv3core PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/mod) | ||
|
|
||
| # When specifying an out-of-tree source a binary directory must be explicitly specified. | ||
| #add_subdirectory(../stochastic_physics stochastic_physics) | ||
| add_subdirectory(stochastic_physics) | ||
|
|
||
| add_library( | ||
| fv3cap | ||
|
|
||
| atmos_model.F90 | ||
| fv3_cap.F90 | ||
| module_fv3_config.F90 | ||
| module_fcst_grid_comp.F90 | ||
| time_utils.F90 | ||
| ) | ||
|
|
||
| if(CCPP) | ||
| target_include_directories(fv3cap PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/ccpp/driver/mod) | ||
| endif() | ||
| target_include_directories(fv3cap PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/stochastic_physics) | ||
| target_compile_definitions(fv3cap PRIVATE -DESMF_VERSION_MAJOR=${ESMF_VERSION_MAJOR}) | ||
| target_include_directories(fv3cap PRIVATE ${ESMF_MOD}) | ||
|
|
||
| target_link_libraries(fv3cap PRIVATE fms) | ||
| target_link_libraries(fv3cap PRIVATE fv3cpl) | ||
| target_link_libraries(fv3cap PRIVATE ${PHYS}physics) | ||
| target_link_libraries(fv3cap PRIVATE ipd) | ||
| target_link_libraries(fv3cap PRIVATE io) | ||
| target_link_libraries(fv3cap PRIVATE fv3core) | ||
| target_link_libraries(fv3cap PRIVATE stochastic_physics) | ||
|
|
||
| set_target_properties(fv3cap PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/mod) | ||
| target_include_directories(fv3cap PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/mod) |
Submodule atmos_cubed_sphere
updated
from e99604 to e53a24
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
|
|
||
| if(NOT DYN32) | ||
| remove_definitions(-DOVERLOAD_R8) | ||
| remove_definitions(-DOVERLOAD_R4) | ||
| endif() | ||
|
|
||
| message ("Force 64 bits in CCPP_layer") | ||
| if(CMAKE_Fortran_COMPILER_ID MATCHES "Intel") | ||
| string (REPLACE "-i4 -real-size 32" "-i4 -real-size 64 -no-prec-div -no-prec-sqrt" CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS}") | ||
| elseif(CMAKE_Fortran_COMPILER_ID MATCHES "GNU") | ||
| set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fdefault-real-8") | ||
| endif() | ||
|
|
||
| add_library( | ||
| ccppdriver | ||
|
|
||
| CCPP_driver.F90 | ||
| ) | ||
|
|
||
| target_link_libraries(ccppdriver ${PHYS}physics) | ||
| target_link_libraries(ccppdriver ccpp) | ||
| target_link_libraries(ccppdriver ccppphys) | ||
|
|
||
| target_include_directories(ccppdriver PRIVATE ${CMAKE_BINARY_DIR}/FV3/ccpp/framework/src) | ||
|
|
||
| set_target_properties(ccppdriver PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/mod) | ||
| target_include_directories(ccppdriver PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/mod) |
Submodule framework
updated
from 78d5d5 to 60b4cc
Submodule physics
updated
from 44f9e5 to a779ea
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,88 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
|
|
||
| <suite name="FV3_GFS_2017_coupled" lib="ccppphys" ver="3"> | ||
| <!-- <init></init> --> | ||
| <group name="time_vary"> | ||
| <subcycle loop="1"> | ||
| <scheme>GFS_time_vary_pre</scheme> | ||
| <scheme>GFS_rrtmg_setup</scheme> | ||
| <scheme>GFS_rad_time_vary</scheme> | ||
| <scheme>GFS_phys_time_vary</scheme> | ||
| </subcycle> | ||
| </group> | ||
| <group name="radiation"> | ||
| <subcycle loop="1"> | ||
| <scheme>GFS_suite_interstitial_rad_reset</scheme> | ||
| <scheme>GFS_rrtmg_pre</scheme> | ||
| <scheme>rrtmg_sw_pre</scheme> | ||
| <scheme>rrtmg_sw</scheme> | ||
| <scheme>rrtmg_sw_post</scheme> | ||
| <scheme>rrtmg_lw_pre</scheme> | ||
| <scheme>rrtmg_lw</scheme> | ||
| <scheme>rrtmg_lw_post</scheme> | ||
| <scheme>GFS_rrtmg_post</scheme> | ||
| </subcycle> | ||
| </group> | ||
| <group name="physics"> | ||
| <subcycle loop="1"> | ||
| <scheme>GFS_suite_interstitial_phys_reset</scheme> | ||
| <scheme>GFS_suite_stateout_reset</scheme> | ||
| <scheme>get_prs_fv3</scheme> | ||
| <scheme>GFS_suite_interstitial_1</scheme> | ||
| <scheme>GFS_surface_generic_pre</scheme> | ||
| <scheme>GFS_surface_composites_pre</scheme> | ||
| <scheme>dcyc2t3</scheme> | ||
| <scheme>GFS_surface_composites_inter</scheme> | ||
| <scheme>GFS_suite_interstitial_2</scheme> | ||
| </subcycle> | ||
| <!-- Surface iteration loop --> | ||
| <subcycle loop="2"> | ||
| <scheme>sfc_diff</scheme> | ||
| <scheme>GFS_surface_loop_control_part1</scheme> | ||
| <scheme>sfc_ocean</scheme> | ||
| <scheme>lsm_noah</scheme> | ||
| <scheme>sfc_cice</scheme> | ||
| <scheme>sfc_sice</scheme> | ||
| <scheme>GFS_surface_loop_control_part2</scheme> | ||
| </subcycle> | ||
| <!-- End of surface iteration loop --> | ||
| <subcycle loop="1"> | ||
| <scheme>GFS_surface_composites_post</scheme> | ||
| <scheme>dcyc2t3_post</scheme> | ||
| <scheme>sfc_diag</scheme> | ||
| <scheme>sfc_diag_post</scheme> | ||
| <scheme>GFS_surface_generic_post</scheme> | ||
| <scheme>GFS_PBL_generic_pre</scheme> | ||
| <scheme>hedmf</scheme> | ||
| <scheme>GFS_PBL_generic_post</scheme> | ||
| <scheme>GFS_GWD_generic_pre</scheme> | ||
| <scheme>cires_ugwp</scheme> | ||
| <scheme>cires_ugwp_post</scheme> | ||
| <scheme>GFS_GWD_generic_post</scheme> | ||
| <scheme>rayleigh_damp</scheme> | ||
| <scheme>GFS_suite_stateout_update</scheme> | ||
| <scheme>ozphys</scheme> | ||
| <scheme>GFS_DCNV_generic_pre</scheme> | ||
| <scheme>get_phi_fv3</scheme> | ||
| <scheme>GFS_suite_interstitial_3</scheme> | ||
| <scheme>samfdeepcnv</scheme> | ||
| <scheme>GFS_DCNV_generic_post</scheme> | ||
| <scheme>GFS_SCNV_generic_pre</scheme> | ||
| <scheme>samfshalcnv</scheme> | ||
| <scheme>GFS_SCNV_generic_post</scheme> | ||
| <scheme>GFS_suite_interstitial_4</scheme> | ||
| <scheme>cnvc90</scheme> | ||
| <scheme>GFS_MP_generic_pre</scheme> | ||
| <scheme>zhaocarr_gscond</scheme> | ||
| <scheme>zhaocarr_precpd</scheme> | ||
| <scheme>GFS_MP_generic_post</scheme> | ||
| <scheme>maximum_hourly_diagnostics</scheme> | ||
| </subcycle> | ||
| </group> | ||
| <group name="stochastics"> | ||
| <subcycle loop="1"> | ||
| <scheme>GFS_stochastics</scheme> | ||
| </subcycle> | ||
| </group> | ||
| <!-- <finalize></finalize> --> | ||
| </suite> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.