Skip to content

Commit 200b6fe

Browse files
grantfirlgrantfirl
committed
Merge branch 'ufs/dev' into feature/phys2dyn_gjf2
2 parents ff2b388 + f922ca6 commit 200b6fe

134 files changed

Lines changed: 6734 additions & 11836 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎.gitmodules‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,11 @@
88
branch = main
99
[submodule "physics/SFC_Layer/MYNN/MYNN"]
1010
path = physics/SFC_Layer/MYNN/MYNN
11-
#url = https://github.com/NCAR/MYNN-SFC
12-
#branch = main
13-
url = https://github.com/grantfirl/MYNN-SFC
14-
branch = feature/tendency_cleanup
11+
url = https://github.com/NCAR/MYNN-SFC
12+
branch = ccpp/dev
13+
[submodule "physics/CONV/C3"]
14+
path = physics/CONV/C3
15+
url = https://github.com/ufs-community/c3
16+
branch = main
17+
18+

‎CMakeLists.txt‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,9 +207,13 @@ target_include_directories(ccpp_physics PUBLIC
207207

208208
target_link_libraries(ccpp_physics PRIVATE MPI::MPI_Fortran)
209209
target_link_libraries(ccpp_physics PUBLIC w3emc::w3emc_d
210-
sp::sp_d
211210
NetCDF::NetCDF_Fortran
212211
)
212+
if(ip_FOUND)
213+
target_link_libraries(ccpp_physics PUBLIC ip::ip_d)
214+
else()
215+
target_link_libraries(ccpp_physics PUBLIC sp::sp_d)
216+
endif()
213217
#add FMS for FV3 only
214218
if(FV3 OR MPAS)
215219
target_link_libraries(ccpp_physics PUBLIC fms)

‎CODEOWNERS‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ physics/GWD/drag_suite.* @md
3030
physics/GWD/gwdc.* @Songyou184 @grantfirl @rhaesung @Qingfu-Liu @dustinswales
3131
physics/GWD/gwdps.* @Songyou184 @grantfirl @rhaesung @Qingfu-Liu @dustinswales
3232
physics/GWD/rayleigh_damp.* @yangfanglin @grantfirl @rhaesung @Qingfu-Liu @dustinswales
33-
physics/GWD/ugwp_driver_v0.F @mdtoyNOAA @grantfirl @rhaesung @Qingfu-Liu @dustinswales
33+
physics/GWD/ugwp_driver_v0.F90 @mdtoyNOAA @grantfirl @rhaesung @Qingfu-Liu @dustinswales
3434
physics/GWD/ugwpv1_gsldrag.* @mdtoyNOAA @BoYang-NOAA @grantfirl @rhaesung @Qingfu-Liu @dustinswales
3535
physics/GWD/ugwpv1_gsldrag_post.* @mdtoyNOAA @BoYang-NOAA @grantfirl @rhaesung @Qingfu-Liu @dustinswales
3636
physics/GWD/unified_ugwp* @mdtoyNOAA @grantfirl @rhaesung @Qingfu-Liu @dustinswales
@@ -149,7 +149,7 @@ physics/Interstitials/UFS_SCM_NEPTUNE/GFS_PBL_generic_pre.*
149149
physics/Interstitials/UFS_SCM_NEPTUNE/GFS_phys_time_vary.fv3.* @grantfirl @rhaesung @Qingfu-Liu @dustinswales
150150
physics/Interstitials/UFS_SCM_NEPTUNE/GFS_phys_time_vary.scm.* @grantfirl @rhaesung @Qingfu-Liu @dustinswales
151151
physics/Interstitials/UFS_SCM_NEPTUNE/GFS_physics_post.* @grantfirl @rhaesung @Qingfu-Liu @dustinswales
152-
physics/Interstitials/UFS_SCM_NEPTUNE/GFS_radiation_surface.* @grantfirl @rhaesung @Qingfu-Liu @dustinswales
152+
physics/Interstitials/UFS_SCM_NEPTUNE/GFS_radiation_surface.* @grantfirl @rhaesung @Qingfu-Liu @dustinswales
153153
physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rad_time_vary.fv3.* @grantfirl @rhaesung @Qingfu-Liu @dustinswales
154154
physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rad_time_vary.scm.* @grantfirl @rhaesung @Qingfu-Liu @dustinswales
155155
physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_cloud_mp.* @dustinswales @Qingfu-Liu @grantfirl @rhaesung @Qingfu-Liu @dustinswales

‎physics/CONV/C3‎

Submodule C3 added at 4a41088

‎physics/CONV/C3/cu_c3_deep.F90‎

Lines changed: 0 additions & 6001 deletions
This file was deleted.

‎physics/CONV/C3/cu_c3_driver.F90‎

Lines changed: 0 additions & 1222 deletions
This file was deleted.

0 commit comments

Comments
 (0)