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

Bugfixes from public release #112

Merged
merged 9 commits into from
May 8, 2020
Merged

Bugfixes from public release #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
57bce37
Update from release/public-v1 (See #43)
jedwards4b Jan 15, 2020
0ea6ce6
Set default calendar to 'gregorian' (See #34)
DusanJovic-NOAA Jan 9, 2020
9aa0522
Update CCPP version number from 3 to 4
climbfuji May 6, 2020
de5b7ce
gfsphysics/GFS_layer/GFS_physics_driver.F90: update comment on locati…
climbfuji May 6, 2020
6e8250a
Add no_nsst CCPP suites from public release
climbfuji May 6, 2020
7641a1d
Update .gitmodules and submodule pointers for ccpp-framework and ccpp…
climbfuji May 6, 2020
d5fda8a
Remove unused and unsupported code (See #31)
DusanJovic-NOAA May 6, 2020
bd142d4
Merge pull request #1 from climbfuji/bugfixes_from_public_release-dom
DusanJovic-NOAA May 6, 2020
ba97e26
Revert "Merge pull request #1 from climbfuji/bugfixes_from_public_rel…
DusanJovic-NOAA May 7, 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
16 changes: 4 additions & 12 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,9 @@
if( NOT DEFINED PHYS)
set(PHYS gfs)
endif()

if (PHYS MATCHES "nam")
add_definitions(-DNAM_phys)
endif()

if(CCPP)
add_definitions(-DCCPP)
endif()

add_subdirectory(cpl)
add_subdirectory(${PHYS}physics)
add_subdirectory(gfsphysics)
add_subdirectory(ipd)
add_subdirectory(io)

Expand Down Expand Up @@ -70,7 +62,7 @@ set_property(SOURCE atmos_cubed_sphere/model/nh_utils.F90 APPEND_STRING PROPERTY
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 gfsphysics)
target_link_libraries(fv3core PRIVATE ipd)

target_include_directories(fv3core PRIVATE ${ESMF_MOD})
Expand All @@ -83,7 +75,7 @@ target_include_directories(fv3core PRIVATE ${ESMF_MOD})
if(CCPP)
add_subdirectory(ccpp)
add_subdirectory(ccpp/driver)
add_dependencies(${PHYS}physics ccpp ccppphys)
add_dependencies(gfsphysics ccpp ccppphys)
add_dependencies(ccppdriver ccpp ccppphys)
add_dependencies(ccppphys ccpp)

Expand Down Expand Up @@ -118,7 +110,7 @@ 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 gfsphysics)
target_link_libraries(fv3cap PRIVATE ipd)
target_link_libraries(fv3cap PRIVATE io)
target_link_libraries(fv3cap PRIVATE fv3core)
Expand Down
2 changes: 1 addition & 1 deletion ccpp/driver/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ add_library(
CCPP_driver.F90
)

target_link_libraries(ccppdriver ${PHYS}physics)
target_link_libraries(ccppdriver gfsphysics)
target_link_libraries(ccppdriver ccpp)
target_link_libraries(ccppdriver ccppphys)

Expand Down
43 changes: 0 additions & 43 deletions compile
View file
Open in desktop

This file was deleted.

134 changes: 0 additions & 134 deletions conf/configure.fv3.gaea
View file
Open in desktop

This file was deleted.

133 changes: 0 additions & 133 deletions conf/configure.fv3.theia
View file
Open in desktop

This file was deleted.

Loading