Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update #1

Merged
merged 128 commits into from
May 19, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
128 commits
Select commit Hold shift + click to select a range
e198c52
this PR includes: 1)vlab #69814: post update,2)ufs issue #3, Add 3D r…
junwang-noaa Nov 5, 2019
0e01f02
fix the add_dim interface
junwang-noaa Nov 6, 2019
d47965c
update gfslmp code changes from Ruiyu
junwang-noaa Nov 6, 2019
2d73753
update satmedmfvdifq from Jongil
junwang-noaa Nov 7, 2019
7e91866
update ccpp with gfdlmp change from Ruiyu
junwang-noaa Nov 7, 2019
3e01822
update idate and nfhours for iau
junwang-noaa Nov 10, 2019
94842bc
fix print line
junwang-noaa Nov 10, 2019
b71e959
initialize ihrst for ihrst
junwang-noaa Nov 10, 2019
2eb8b2c
initialize ihrst for inline post
junwang-noaa Nov 11, 2019
248196c
add comments for write grid comp idate change when iau is enabled
junwang-noaa Nov 12, 2019
bddc70c
update fv3 dycore and ccpp physics repo
junwang-noaa Nov 15, 2019
97d12bc
checkout out dev/emc from EMC fv3 dycore repo and master branch in NC…
junwang-noaa Nov 15, 2019
b18739d
Merge pull request #8 from junwang-noaa/bugfixes
junwang-noaa Nov 15, 2019
5bfd3c6
update submodules atmos_cubed_sphere and ccpp/physics for fv3atm #8
junwang-noaa Nov 15, 2019
ea91f65
The HAFS related developments for the write_grid_component (#10)
BinLiu-NOAA Nov 25, 2019
03f7d78
Merge branch 'develop' of https://github.com/NOAA-EMC/fv3atm into HEAD
climbfuji Nov 27, 2019
9caa172
Update submodule pointer for ccpp/physics
climbfuji Nov 27, 2019
ac71e23
ccpp/CMakeLists.txt: add flag '-Wall' to DEBUG flags for GNU compiler
climbfuji Nov 30, 2019
2de4377
Update submodule pointers for ccpp-framework and ccpp-physics
climbfuji Dec 2, 2019
eae6786
Update submodule pointers for atmos_cubed_sphere, ccpp/framework, ccp…
climbfuji Dec 3, 2019
88e87e9
Merge pull request #11 from climbfuji/dtc_develop_udpate_from_emc_201…
climbfuji Dec 3, 2019
26de321
change ifmin to zero at fh00 for inline POST (#14)
junwang-noaa Dec 4, 2019
66c7001
remove sfc_noahmp_pre interstitial scheme from prebuild and SDF, move…
grantfirl Dec 5, 2019
c9322aa
change RUC surface precip vars to Sfcprop DDT in GFS_restart.F90
grantfirl Dec 5, 2019
0a292c4
Merge branch 'develop' of https://github.com/NOAA-EMC/fv3atm into HEAD
climbfuji Dec 5, 2019
eb4c2e0
make associated change to GFS_physics_driver for NoahMP precip rates
grantfirl Dec 6, 2019
41884c2
Merge branch 'fix_noahmp_precip_rates' of https://github.com/grantfir…
climbfuji Dec 6, 2019
3be9f98
Merge branch 'dtc/develop' of https://github.com/panll/fv3atm into up…
climbfuji Dec 6, 2019
aa99bea
fix array dimensions for phii, prsi in ugwp_driver_v0.F
grantfirl Dec 6, 2019
b317eae
Bugfixes for NoahMP precipitation rate PR
climbfuji Dec 6, 2019
3780030
Merge branch 'fix_cires_ugwp_dimension_bug' of https://github.com/gra…
climbfuji Dec 6, 2019
718b7a5
fix cires_ugwp_init call arguments in GFS_driver.F90 (there is no iss…
grantfirl Dec 6, 2019
1c7f2c1
Merge branch 'fix_cires_ugwp_dimension_bug' of https://github.com/gra…
climbfuji Dec 6, 2019
fd8b1d6
Update submodule pointer for ccpp/physics
climbfuji Dec 9, 2019
5264272
Merge pull request #15 from climbfuji/update_dtc_develop_from_emc_dev…
climbfuji Dec 9, 2019
8a56781
Add support for cmake build system (#20)
DusanJovic-NOAA Dec 10, 2019
38b8834
change suite_FV3_GFS_v15.2 to suite_FV3_GFS_v15p2
grantfirl Dec 12, 2019
153ae61
Merge pull request #20 from grantfirl/fix_GFS_v15p2_name
climbfuji Dec 12, 2019
d0a75a9
Merge branch 'develop' of https://github.com/noaa-emc/fv3atm into HEAD
climbfuji Dec 14, 2019
9228d4c
Updates from ufs_public_release: use correct NETCDF variable for new …
climbfuji Dec 16, 2019
6353b7c
Merge pull request #21 from climbfuji/update_dtc_develop_from_ufs_pub…
climbfuji Dec 17, 2019
fa72e2b
io/FV3GFS_io.F90: bugfix for cold starts from RAP/HRRR initial condit…
climbfuji Dec 23, 2019
869374c
updates in inline post and restart files and bug fix in ugwd (#27)
junwang-noaa Dec 26, 2019
e14e81f
Merge pull request #22 from climbfuji/sar_fix_hrrr_ics
climbfuji Dec 26, 2019
c58e27a
Bugfix in the cap at lake points; fice is wrt water area for sea ice …
ShanSunNOAA Jan 8, 2020
e15f304
assign tsfco/zorlo (over water) to tsfcl/zorll (over land) initially,…
ShanSunNOAA Jan 9, 2020
1f61c0b
Limit ice frac to be <=1.
ShanSunNOAA Jan 9, 2020
b1ddd67
Update EMC dev/emc from NCAR dtc/develop 2019/12/17 (#30)
climbfuji Jan 10, 2020
fdb78ae
Cosmetic changes
ShanSunNOAA Jan 11, 2020
7ffe647
GFSv16 netcdf post ficein cpl (#48)
DusanJovic-NOAA Jan 24, 2020
77e0957
Merge branch 'develop' of https://github.com/noaa-emc/fv3atm into HEAD
climbfuji Jan 27, 2020
9234128
Update .gitmodules for code review and testing
climbfuji Jan 27, 2020
35bbaf7
Revert .gitmodules change, update submodule pointers
climbfuji Feb 3, 2020
9de2a9d
Merge pull request #24 from climbfuji/update_dtc_develop_from_develop
climbfuji Feb 3, 2020
b7a44c5
parallel netcdf IO (#41)
jswhit2 Feb 4, 2020
b2614a4
Update .gitmodules and submodule pointers for code review and testing
climbfuji Feb 5, 2020
8f057b8
-- Merged atmos_model.F90, GFS_physics_driver.F90 & FV3GFS_io.F90 to …
ShanSunNOAA Feb 5, 2020
94006f6
Merging to master: no changes in results in the non-CCPP control run
ShanSunNOAA Feb 5, 2020
cf0fad6
Revert change to .gitmodules, update submodule pointers for ccpp-fram…
climbfuji Feb 6, 2020
756ef51
Merge pull request #25 from climbfuji/dom_combine_prs_20200204
climbfuji Feb 6, 2020
42bc16e
Update .gitmodules and submodule pointer for ccpp-physics for code re…
ShanSunNOAA Feb 14, 2020
e83422c
Revert change to smoiseq definition
ShanSunNOAA Feb 14, 2020
b4eddd5
Bug fix in FV3GFS_io.F90. Results are bitwise identical in standalone…
ShanSunNOAA Feb 15, 2020
c13ed87
Correcting comments
ShanSunNOAA Feb 17, 2020
8683a69
Iaudrymass coupledfield ww3 (#61)
junwang-noaa Feb 18, 2020
22f0dcb
Updating Coupling%tisfcin_cpl over ocean points only
ShanSunNOAA Feb 20, 2020
5c6bd37
Merge branch 'develop' of https://github.com/NOAA-EMC/fv3atm into HEAD
climbfuji Feb 28, 2020
bf5bfa1
Update submodule pointer for .gitmodules for code review and testing
climbfuji Mar 4, 2020
38a495e
Sm jan102020 (#44)
SMoorthi-emc Mar 6, 2020
c6e17ef
Revert change to .gitmodules, update submodule pointer for atmos_cube…
climbfuji Mar 9, 2020
1a385e3
Merge pull request #27 from climbfuji/update_dtc_develop_from_emc
climbfuji Mar 9, 2020
3375ede
Merge branch 'develop' of https://github.com/NOAA-EMC/fv3atm into HEAD
climbfuji Mar 11, 2020
fc9a4c2
fix omp error in dycore and atmos_model.F90 (#77)
DusanJovic-NOAA Mar 11, 2020
2507045
Add moninedmf_hafs.f to CCPP prebuild config
climbfuji Mar 12, 2020
2de5048
Update .gitmodules for code review
climbfuji Mar 12, 2020
4e54579
Merge branch 'develop' of https://github.com/NOAA-EMC/fv3atm into mer…
climbfuji Mar 12, 2020
13b04a4
Merging develop (fc9a4c2) into branch fractional_landmask
ShanSunNOAA Mar 12, 2020
cc085c7
Revert change .gitmodules and update submodule pointer for ccpp/physics
climbfuji Mar 12, 2020
e88f2b3
Merge pull request #29 from climbfuji/merge_emc_develop_20200311_afte…
climbfuji Mar 12, 2020
6d3399b
Merge branch 'dtc/develop' of https://github.com/NCAR/fv3atm into upd…
climbfuji Mar 12, 2020
67c8b06
Add nsradar_reset to control resetting radar calculations for Thompso…
climbfuji Mar 12, 2020
b8f6e8e
Setting fice=1 if fice>1.-1.e-10
ShanSunNOAA Mar 12, 2020
1b5bd6e
Update .gitmodules for code review and testing
climbfuji Mar 12, 2020
872b8fc
gfsphysics/GFS_layer/GFS_typedefs.F90: bugfix for declaration of vari…
climbfuji Mar 13, 2020
fcb1313
Revert change to .gitmodules, update submodule pointers for GFDL_atmo…
climbfuji Mar 13, 2020
722339d
Merge pull request #30 from climbfuji/update_from_dev_emc_20200312_an…
climbfuji Mar 13, 2020
94c863e
Merge branch 'fractional_landmask' of https://github.com/shansun6/fv3…
climbfuji Mar 13, 2020
8645684
gfsphysics/GFS_layer/GFS_typedefs.F90: bugfix for Thompson radar refl…
climbfuji Mar 16, 2020
811ca4d
Support for CCPP with hera.gnu
climbfuji Mar 16, 2020
9b79ce1
Revert change to .gitmodules and update submodule pointer for ccpp-ph…
climbfuji Mar 17, 2020
8672795
Merge pull request #31 from climbfuji/final_pr_before_merging_to_deve…
climbfuji Mar 17, 2020
d196b0e
Squashed commit of the following:
climbfuji Mar 17, 2020
515a83f
Update EMC develop from NCAR dtc/develop 2020/03/17 (#81)
climbfuji Mar 19, 2020
b14368a
Formatting changes to several files; reversal of changes to gfsphysic…
climbfuji Mar 17, 2020
58977b7
Remove dcyc2t3_post from RRTMGP SDF, rename doRRTMGP to do_RRTMGP to …
climbfuji Mar 19, 2020
51ffb8e
Update to CCPP prebuild config and make/cmake build systems to accomm…
climbfuji Mar 19, 2020
041ea4c
Merge branch 'develop' of https://github.com/NOAA-EMC/fv3atm into add…
climbfuji Mar 19, 2020
0af0078
From @dustinswales: bugfix for optional arguments for RRTMGP in ccpp/…
climbfuji Mar 20, 2020
8f9871e
Cleanup RRTMGP optional argument logic.
dustinswales Mar 23, 2020
3815ff1
Update submodule pointer for ccpp-framework after merging Python 3 co…
climbfuji Mar 25, 2020
c678c68
gfsphysics/GFS_layer/GFS_typedefs.F90: re-enable initialization/reset…
climbfuji Mar 25, 2020
cc4b75d
Add guard to GFS_typedefs.F90 to prevent running RRTMGP with levr<levs
climbfuji Mar 26, 2020
d1b1548
Revert change .gitmodules and update submodule pointers for ccpp-fram…
climbfuji Mar 26, 2020
3ffe2b4
Merge pull request #32 from climbfuji/add_rrtmgp_dom
climbfuji Mar 26, 2020
083dc6c
Regain bit-for-bit identical results between IPD and CCPP for coupled…
climbfuji Mar 27, 2020
14becd4
Update .gitmodules and submodule pointer for ccpp-physics for code re…
climbfuji Apr 1, 2020
e05ad13
Clean up of radiation tendencies standard names as described in issue…
climbfuji Apr 1, 2020
18f7cef
Revert change to .gitmodules and update submodule pointer for ccpp-ph…
climbfuji Apr 2, 2020
59e02cc
Merge pull request #34 from climbfuji/cleanup_radiation_tendencies
climbfuji Apr 2, 2020
f95cedb
Update .gitmodules and submodule pointers for ccpp-framework and ccpp…
climbfuji Apr 2, 2020
053edd9
Revert change to .gitmodules, update submodule pointers for ccpp-fram…
climbfuji Apr 3, 2020
485de28
Merge pull request #35 from climbfuji/avoid_recompile_without_change
climbfuji Apr 3, 2020
d444a9a
Update submodule pointer for ccpp-physics
climbfuji Apr 3, 2020
f0e8d7c
Merge pull request #36 from climbfuji/update_submodule_pointer_ccpp_p…
climbfuji Apr 3, 2020
7c3eade
Regional BC blending and BCs into GSI (#80)
TomBlack-NOAA Apr 8, 2020
cfa5541
Merge branch 'develop' of https://github.com/NOAA-EMC/fv3atm into HEAD
climbfuji Apr 9, 2020
13cc9ea
CMakeLists.txt: add dependency on CCPP for fv3cap library
climbfuji Jan 21, 2020
2f1a5c5
gfsphysics/physics/ugwp_driver_v0.f: comment out unnecessary prints t…
climbfuji Apr 10, 2020
931dc32
ccpp/CMakeLists.txt: require cmake 3.0, remove legacy syntax for poli…
climbfuji Apr 10, 2020
2e86456
Update .gitmodules and submodule pointers for ccpp-framework, ccpp-ph…
climbfuji Apr 10, 2020
96be1d3
Revert change to .gitmodules and update submodule pointers for GFDL_a…
climbfuji Apr 10, 2020
f089bbf
Merge pull request #40 from climbfuji/update_dtc_develop_from_emc_dev…
climbfuji Apr 10, 2020
9b5a420
options for IN/CNN and MERRA2 climo of microphysics fv3atm (#46)
AnningCheng-NOAA Apr 10, 2020
2130922
Merge branch 'develop' of https://github.com/NOAA-emc/fv3atm into HEAD
climbfuji Apr 10, 2020
50501ec
Apply missing updates for MG-IN-CCN changes
climbfuji Apr 10, 2020
27ce0d4
Update .gitmodules and submodule pointer for ccpp-physics for code re…
climbfuji Apr 10, 2020
9cec3b5
Revert change to .gitmodules and update submodule pointer for ccpp-ph…
climbfuji Apr 14, 2020
50c6de3
Merge pull request #42 from climbfuji/update_dtc_develop_from_emc_dev…
climbfuji Apr 14, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
*.o
*.mod
*.a
*.pyc
131 changes: 131 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,131 @@
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)
add_dependencies(fv3cap ccppdriver ccppphys)
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)
Loading