diff --git a/share/CESM_share b/share/CESM_share index 3dd7edb..a48ff87 160000 --- a/share/CESM_share +++ b/share/CESM_share @@ -1 +1 @@ -Subproject commit 3dd7edb12d3fc109914f922f3131711cf0d7fbd4 +Subproject commit a48ff8790a21d3831873ed9f023a43c606a1ef03 diff --git a/share/CMakeLists.txt b/share/CMakeLists.txt index 1b60129..4544e53 100644 --- a/share/CMakeLists.txt +++ b/share/CMakeLists.txt @@ -25,6 +25,7 @@ target_sources(OM3_share PRIVATE CESM_share/src/nuopc_shr_methods.F90 CESM_share/src/shr_abort_mod.F90 CESM_share/src/shr_cal_mod.F90 + CESM_share/src/shr_const_mod.F90 CESM_share/src/shr_file_mod.F90 CESM_share/src/shr_kind_mod.F90 CESM_share/src/shr_log_mod.F90 @@ -34,6 +35,7 @@ target_sources(OM3_share PRIVATE CESM_share/src/shr_orb_mod.F90 CESM_share/src/shr_pio_mod.F90 CESM_share/src/shr_precip_mod.F90 + CESM_share/src/shr_reprosum_mod.F90 CESM_share/src/shr_reprosumx86.c CESM_share/src/shr_strconvert_mod.F90 CESM_share/src/shr_string_mod.F90 @@ -46,7 +48,6 @@ target_sources(OM3_share PRIVATE stubs/mct_mod.F90 ) add_patched_source(OM3_share CESM_share/src/shr_const_mod.F90) -add_patched_source(OM3_share CESM_share/src/shr_reprosum_mod.F90) if(CMAKE_Fortran_COMPILER_ID MATCHES "Intel") # CESM reduces the precision and increases speed for the following file diff --git a/share/patches/shr_reprosum_mod.F90.patch b/share/patches/shr_reprosum_mod.F90.patch deleted file mode 100644 index 8e7a137..0000000 --- a/share/patches/shr_reprosum_mod.F90.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/src/shr_reprosum_mod.F90 b/src/shr_reprosum_mod.F90 -index fb61f42..9996c51 100644 ---- a/src/shr_reprosum_mod.F90 -+++ b/src/shr_reprosum_mod.F90 -@@ -450,8 +450,9 @@ module shr_reprosum_mod - else - mpi_comm = MPI_COMM_WORLD - endif -+#ifdef TIMING - call t_barrierf('sync_repro_sum',mpi_comm) -- -+#endif - ! check whether should abort if input contains NaNs or INFs - abort_inf_nan = .not. repro_sum_allow_infnan - if ( present(allow_infnan) ) then