Skip to content

Commit 827564e

Browse files
committed
Revert "Merge branch 'develop' of https://github.com/ufs-community/ufs-weather-model into feature/rad-fix-new"
This reverts commit cf66a90, reversing changes made to 49445ac.
1 parent cf66a90 commit 827564e

File tree

129 files changed

+4193
-3607
lines changed

Some content is hidden

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

129 files changed

+4193
-3607
lines changed

.github/pull_request_template.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -146,11 +146,10 @@ Please delete what is not needed.
146146
- [ ] Orion
147147
- [ ] Hercules
148148
- [ ] Jet
149-
- [ ] GaeaC5
150-
- [ ] GaeaC6
149+
- [ ] Gaea
151150
- [ ] Derecho
152151
- WCOSS2
153152
- [ ] Dogwood/Cactus
154153
- [ ] Acorn
155154
- [ ] CI
156-
- [ ] opnReqTest (complete task if unnecessary)
155+
- [ ] opnReqTest (complete task if unnecessary)

CDEPS-interface/CDEPS

Submodule CDEPS updated 69 files

CDEPS-interface/CMakeLists.txt

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -95,14 +95,6 @@ target_include_directories(dwav PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY
9595
target_link_libraries(dwav PRIVATE dshr share streams)
9696
target_link_libraries(dwav PRIVATE esmf)
9797

98-
# CDEPS/dglc
99-
add_library(dglc OBJECT ${cdeps_dglc_files})
100-
add_dependencies(dglc share streams dshr)
101-
set_target_properties(dglc PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/mod)
102-
target_include_directories(dglc PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/mod>)
103-
target_link_libraries(dglc PRIVATE dshr share streams)
104-
target_link_libraries(dglc PRIVATE esmf PIO::PIO_Fortran)
105-
10698
# CDEPS
10799
add_library(cdeps STATIC $<TARGET_OBJECTS:share>
108100
$<TARGET_OBJECTS:streams>
@@ -112,8 +104,7 @@ add_library(cdeps STATIC $<TARGET_OBJECTS:share>
112104
$<TARGET_OBJECTS:dlnd>
113105
$<TARGET_OBJECTS:docn>
114106
$<TARGET_OBJECTS:drof>
115-
$<TARGET_OBJECTS:dwav>
116-
$<TARGET_OBJECTS:dglc>)
107+
$<TARGET_OBJECTS:dwav>)
117108
add_library(cdeps::cdeps ALIAS cdeps)
118109
target_include_directories(cdeps PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/mod>
119110
$<INSTALL_INTERFACE:mod>)

CDEPS-interface/cdeps_files.cmake

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ list(APPEND cdeps_share_files
2525
CDEPS/share/shr_timer_mod.F90
2626
CDEPS/share/shr_file_mod.F90
2727
CDEPS/share/shr_nl_mod.F90
28-
CDEPS/share/nuopc_shr_methods.F90
2928
)
3029

3130
list(APPEND cdeps_streams_files
@@ -69,8 +68,6 @@ list(APPEND cdeps_docn_files
6968
CDEPS/docn/docn_datamode_iaf_mod.F90
7069
CDEPS/docn/docn_datamode_som_mod.F90
7170
CDEPS/docn/docn_datamode_cplhist_mod.F90
72-
CDEPS/docn/docn_datamode_multilev_mod.F90
73-
CDEPS/docn/docn_datamode_multilev_dom_mod.F90
7471
CDEPS/docn/docn_import_data_mod.F90
7572
CDEPS/docn/ocn_comp_nuopc.F90
7673
)
@@ -82,8 +79,3 @@ list(APPEND cdeps_drof_files
8279
list(APPEND cdeps_dwav_files
8380
CDEPS/dwav/wav_comp_nuopc.F90
8481
)
85-
86-
list(APPEND cdeps_dglc_files
87-
CDEPS/dglc/dglc_datamode_noevolve_mod.F90
88-
CDEPS/dglc/glc_comp_nuopc.F90
89-
)

CMEPS-interface/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ list(APPEND _ufs_util_files
4343
${PROJECT_SOURCE_DIR}/CDEPS-interface/CDEPS/share/shr_kind_mod.F90
4444
${PROJECT_SOURCE_DIR}/CDEPS-interface/ufs/cdeps_share/shr_assert_mod.F90
4545
${PROJECT_SOURCE_DIR}/CDEPS-interface/ufs/cdeps_share/shr_infnan_mod.F90
46-
${PROJECT_SOURCE_DIR}/CDEPS-interface/CDEPS/share/nuopc_shr_methods.F90
4746
${PROJECT_SOURCE_DIR}/CDEPS-interface/ufs/cdeps_share/shr_is_restart_fh_mod.F90)
4847

4948
list(APPEND _mediator_files
@@ -67,6 +66,7 @@ list(APPEND _mediator_files
6766
CMEPS/mediator/med_phases_prep_ocn_mod.F90
6867
CMEPS/mediator/esmFlds.F90
6968
CMEPS/mediator/med.F90
69+
CMEPS/mediator/med_time_mod.F90
7070
CMEPS/mediator/med_phases_ocnalb_mod.F90
7171
CMEPS/mediator/med_phases_prep_wav_mod.F90
7272
CMEPS/mediator/med_utils_mod.F90
File renamed without changes.
File renamed without changes.

cmake/configure_gaeac6.intel.cmake

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

cmake/configure_gaeac6.intelllvm.cmake

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

0 commit comments

Comments
 (0)