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.

Sign up for GitHub

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

Submodule pointer updates for ccpp-framework and ccpp-physics, fix compile error on macOS #747

Merged
merged 17 commits into from
Feb 23, 2024
Merged

Submodule pointer updates for ccpp-framework and ccpp-physics, fix compile error on macOS #747

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
3c3d655
Update .gitmodules and submodule pointer for ccpp-framework for code …
climbfuji Dec 22, 2023
6d0b052
Merge branch 'develop' of https://github.com/NOAA-EMC/fv3atm into fea…
climbfuji Dec 22, 2023
593a9e0
Update submodule pointer for ccpp-framework
climbfuji Dec 26, 2023
e74e5a4
Update .gitmodules and submodule pointers for ccpp-framework and ccpp…
climbfuji Dec 27, 2023
ffc54e6
Bug fix in io/module_wrt_grid_comp.F90 to compile on macOS with apple…
climbfuji Dec 27, 2023
db82930
Fix typo in .gitmodules
climbfuji Dec 27, 2023
5374684
Update submodule pointer for ccpp-framework
climbfuji Dec 27, 2023
eda337c
Merge branch 'develop' of https://github.com/NOAA-EMC/fv3atm into fea…
climbfuji Dec 28, 2023
88fac19
Update submodule pointer for ccpp-framework
climbfuji Dec 28, 2023
ee91285
Clean up comments in io/module_wrt_grid_comp.F90
climbfuji Dec 28, 2023
efa44b8
Merge branch 'develop' of https://github.com/NOAA-EMC/fv3atm into fea…
climbfuji Jan 10, 2024
713ba7d
Update submodule pointer for ccpp-framework
climbfuji Jan 10, 2024
622e81e
Merge branch 'develop' of https://github.com/NOAA-EMC/fv3atm into fea…
climbfuji Jan 18, 2024
2670ba1
Merge branch 'develop' of https://github.com/NOAA-EMC/fv3atm into fea…
climbfuji Feb 7, 2024
7defec6
Merge branch 'develop' of https://github.com/NOAA-EMC/fv3atm into fea…
climbfuji Feb 21, 2024
8e642bb
Update submodule pointer for ccpp-physics
climbfuji Feb 21, 2024
b0ec5a5
Revert .gitmodules and update submodule pointers for ccpp-framework a…
climbfuji Feb 23, 2024
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
12 changes: 8 additions & 4 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,16 @@
branch = dev/emc
[submodule "ccpp/framework"]
path = ccpp/framework
url = https://github.com/NCAR/ccpp-framework
branch = main
#url = https://github.com/NCAR/ccpp-framework
#branch = main
url = https://github.com/climbfuji/ccpp-framework
branch = feature/ccpp_prebuild_chunked_array_support
[submodule "ccpp/physics"]
path = ccpp/physics
url = https://github.com/ufs-community/ccpp-physics
branch = ufs/dev
#url = https://github.com/ufs-community/ccpp-physics
#branch = ufs/dev
url = https://github.com/climbfuji/ccpp-physics
branch = bugfix/ozphys_ccpp_compliant
[submodule "upp"]
path = upp
url = https://github.com/NOAA-EMC/UPP
Expand Down
2 changes: 1 addition & 1 deletion ccpp/framework
Open in desktop
Submodule framework updated 25 files
+47 −0 .github/workflows/prebuild.yaml
+4 −0 scripts/common.py
+224 −75 scripts/mkstatic.py
+10 −6 src/ccpp_types.F90
+6 −0 src/ccpp_types.meta
+90 −0 test_prebuild/test_blocked_data/CMakeLists.txt
+13 −0 test_prebuild/test_blocked_data/README.md
+118 −0 test_prebuild/test_blocked_data/blocked_data_scheme.F90
+147 −0 test_prebuild/test_blocked_data/blocked_data_scheme.meta
+81 −0 test_prebuild/test_blocked_data/ccpp_prebuild_config.py
+41 −0 test_prebuild/test_blocked_data/data.F90
+69 −0 test_prebuild/test_blocked_data/data.meta
+107 −0 test_prebuild/test_blocked_data/main.F90
+9 −0 test_prebuild/test_blocked_data/suite_blocked_data_suite.xml
+90 −0 test_prebuild/test_chunked_data/CMakeLists.txt
+13 −0 test_prebuild/test_chunked_data/README.md
+81 −0 test_prebuild/test_chunked_data/ccpp_prebuild_config.py
+118 −0 test_prebuild/test_chunked_data/chunked_data_scheme.F90
+147 −0 test_prebuild/test_chunked_data/chunked_data_scheme.meta
+43 −0 test_prebuild/test_chunked_data/data.F90
+76 −0 test_prebuild/test_chunked_data/data.meta
+108 −0 test_prebuild/test_chunked_data/main.F90
+9 −0 test_prebuild/test_chunked_data/suite_chunked_data_suite.xml
+0 −0 test_prebuild/test_metadata_parser.py
+0 −0 test_prebuild/test_mkstatic.py
2 changes: 1 addition & 1 deletion ccpp/physics
Open in desktop
Submodule physics updated 3 files
+8 −7 physics/GFS_suite_stateout_update.F90
+7 −0 physics/GFS_suite_stateout_update.meta
+19 −13 physics/module_ozphys.F90
3 changes: 2 additions & 1 deletion io/module_wrt_grid_comp.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,9 @@ module module_wrt_grid_comp
!
use mpi
use esmf
use fms_mod, only : uppercase
use fms
use mpp_mod, only : mpp_init ! needed for fms 2023.02
use mpp_mod, only : mpp_init, mpp_error

use write_internal_state
use module_fv3_io_def, only : num_pes_fcst, &
Expand Down