diff --git a/CDEPS/CDEPS b/CDEPS/CDEPS index a4e9d13..8197f05 160000 --- a/CDEPS/CDEPS +++ b/CDEPS/CDEPS @@ -1 +1 @@ -Subproject commit a4e9d13a50bd97104756298252b120e405e4d6d6 +Subproject commit 8197f05ef2549d3c53e4050c9821a683e2728bab diff --git a/CDEPS/CMakeLists.txt b/CDEPS/CMakeLists.txt index 65f770d..16d7f10 100644 --- a/CDEPS/CMakeLists.txt +++ b/CDEPS/CMakeLists.txt @@ -14,10 +14,10 @@ target_sources(OM3_cdeps_common PRIVATE CDEPS/streams/dshr_stream_mod.F90 CDEPS/streams/dshr_tinterp_mod.F90 + CDEPS/dshr/dshr_mod.F90 CDEPS/dshr/dshr_dfield_mod.F90 CDEPS/dshr/dshr_fldlist_mod.F90 ) -add_patched_source(OM3_cdeps_common CDEPS/dshr/dshr_mod.F90) ## DATM add_fortran_library(OM3_cdeps_datm mod/datm STATIC) diff --git a/CDEPS/patches/dshr_mod.F90.patch b/CDEPS/patches/dshr_mod.F90.patch deleted file mode 100644 index 349a216..0000000 --- a/CDEPS/patches/dshr_mod.F90.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/dshr/dshr_mod.F90 b/dshr/dshr_mod.F90 -index ca87f2e..7d6bd71 100644 ---- a/dshr/dshr_mod.F90 -+++ b/dshr/dshr_mod.F90 -@@ -1058,7 +1058,6 @@ contains - type(io_desc_t) :: pio_iodesc - integer :: oldmode - integer :: rcode -- character(len=CS) :: lrpfile - character(*), parameter :: F00 = "('(dshr_restart_write) ',2a,2(i0,2x))" - !------------------------------------------------------------------------------- - -@@ -1071,7 +1070,7 @@ contains - - ! write restart info to rpointer file - if (my_task == main_task) then -- open(newunit=nu, file=trim(lrpfile), form='formatted') -+ open(newunit=nu, file=trim(rpfile), form='formatted') - write(nu,'(a)') rest_file_model - close(nu) - write(logunit,F00)' writing ',trim(rest_file_model)