Skip to content

Commit 9e80d4a

Browse files
committed
Merge branch 'jgfouca/gw_cleanup_round' into master (PR #7827)
Some cleanup and bfb fixes in EAMxx gw. Change list: 1) Remove redundant gw_ from file names 2) Move all constants into constant struct in Functions 3) Add a tol for some front bfb unit tests 4) Another small EKAT update to bring in h2d|d2h improvements. This should fix CI issues with small round-off-level diffs. [BFB] * jgfouca/gw_cleanup_round: GPU didn't like this constant for some reason Go ahead and update EKAT too Tol needed in a couple places A last round of easy cleanup for the GW port
2 parents e9e20b9 + cc68cdb commit 9e80d4a

File tree

62 files changed

+136
-142
lines changed

Some content is hidden

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

62 files changed

+136
-142
lines changed

components/eamxx/src/physics/gw/CMakeLists.txt

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -5,29 +5,29 @@ set(GW_SRCS
55
# Add ETI source files if not on CUDA/HIP
66
if (NOT EAMXX_ENABLE_GPU OR Kokkos_ENABLE_CUDA_RELOCATABLE_DEVICE_CODE OR Kokkos_ENABLE_HIP_RELOCATABLE_DEVICE_CODE)
77
list(APPEND GW_SRCS
8-
eti/gw_gwd_compute_tendencies_from_stress_divergence.cpp
9-
eti/gw_gw_prof.cpp
8+
eti/gw_compute_tendencies_from_stress_divergence.cpp
9+
eti/gw_prof.cpp
1010
eti/gw_momentum_energy_conservation.cpp
11-
eti/gw_gwd_compute_stress_profiles_and_diffusivities.cpp
12-
eti/gw_gwd_project_tau.cpp
13-
eti/gw_gwd_precalc_rhoi.cpp
14-
eti/gw_gw_drag_prof.cpp
15-
eti/gw_gw_front_project_winds.cpp
16-
eti/gw_gw_front_gw_sources.cpp
17-
eti/gw_gw_cm_src.cpp
18-
eti/gw_gw_convect_project_winds.cpp
19-
eti/gw_gw_heating_depth.cpp
20-
eti/gw_gw_storm_speed.cpp
21-
eti/gw_gw_convect_gw_sources.cpp
22-
eti/gw_gw_beres_src.cpp
23-
eti/gw_gw_ediff.cpp
24-
eti/gw_gw_diff_tend.cpp
25-
eti/gw_gw_oro_src.cpp
26-
eti/gw_gw_common_init.cpp
11+
eti/gw_compute_stress_profiles_and_diffusivities.cpp
12+
eti/gw_project_tau.cpp
13+
eti/gw_precalc_rhoi.cpp
14+
eti/gw_drag_prof.cpp
15+
eti/gw_front_project_winds.cpp
16+
eti/gw_front_gw_sources.cpp
17+
eti/gw_cm_src.cpp
18+
eti/gw_convect_project_winds.cpp
19+
eti/gw_heating_depth.cpp
20+
eti/gw_storm_speed.cpp
21+
eti/gw_convect_gw_sources.cpp
22+
eti/gw_beres_src.cpp
23+
eti/gw_ediff.cpp
24+
eti/gw_diff_tend.cpp
25+
eti/gw_oro_src.cpp
26+
eti/gw_common_init.cpp
2727
eti/gw_vd_lu_decomp.cpp
2828
eti/gw_vd_lu_solve.cpp
29-
eti/gw_gw_convect_init.cpp
30-
eti/gw_gw_front_init.cpp
29+
eti/gw_convect_init.cpp
30+
eti/gw_front_init.cpp
3131
) # GW ETI SRCS
3232
endif()
3333

components/eamxx/src/physics/gw/eti/gw_gw_beres_src.cpp renamed to components/eamxx/src/physics/gw/eti/gw_beres_src.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "impl/gw_gw_beres_src_impl.hpp"
1+
#include "impl/gw_beres_src_impl.hpp"
22

33
namespace scream {
44
namespace gw {

components/eamxx/src/physics/gw/eti/gw_gw_cm_src.cpp renamed to components/eamxx/src/physics/gw/eti/gw_cm_src.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "impl/gw_gw_cm_src_impl.hpp"
1+
#include "impl/gw_cm_src_impl.hpp"
22

33
namespace scream {
44
namespace gw {

components/eamxx/src/physics/gw/eti/gw_gw_common_init.cpp renamed to components/eamxx/src/physics/gw/eti/gw_common_init.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "impl/gw_gw_common_init_impl.hpp"
1+
#include "impl/gw_common_init_impl.hpp"
22

33
namespace scream {
44
namespace gw {
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "impl/gw_gwd_compute_stress_profiles_and_diffusivities_impl.hpp"
1+
#include "impl/gw_compute_stress_profiles_and_diffusivities_impl.hpp"
22

33
namespace scream {
44
namespace gw {
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "impl/gw_gwd_compute_tendencies_from_stress_divergence_impl.hpp"
1+
#include "impl/gw_compute_tendencies_from_stress_divergence_impl.hpp"
22

33
namespace scream {
44
namespace gw {

components/eamxx/src/physics/gw/eti/gw_gw_convect_gw_sources.cpp renamed to components/eamxx/src/physics/gw/eti/gw_convect_gw_sources.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "impl/gw_gw_convect_gw_sources_impl.hpp"
1+
#include "impl/gw_convect_gw_sources_impl.hpp"
22

33
namespace scream {
44
namespace gw {

components/eamxx/src/physics/gw/eti/gw_gw_convect_init.cpp renamed to components/eamxx/src/physics/gw/eti/gw_convect_init.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "impl/gw_gw_convect_init_impl.hpp"
1+
#include "impl/gw_convect_init_impl.hpp"
22

33
namespace scream {
44
namespace gw {

components/eamxx/src/physics/gw/eti/gw_gw_convect_project_winds.cpp renamed to components/eamxx/src/physics/gw/eti/gw_convect_project_winds.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "impl/gw_gw_convect_project_winds_impl.hpp"
1+
#include "impl/gw_convect_project_winds_impl.hpp"
22

33
namespace scream {
44
namespace gw {

components/eamxx/src/physics/gw/eti/gw_gw_diff_tend.cpp renamed to components/eamxx/src/physics/gw/eti/gw_diff_tend.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "impl/gw_gw_diff_tend_impl.hpp"
1+
#include "impl/gw_diff_tend_impl.hpp"
22

33
namespace scream {
44
namespace gw {

0 commit comments

Comments
 (0)