fix issue in docn

ESCOMP · Oct 3, 2024 · c2c4274 · c2c4274
1 parent d5da82e
commit c2c4274
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/docn/ocn_comp_nuopc.F90 b/docn/ocn_comp_nuopc.F90
@@ -582,7 +582,7 @@ subroutine docn_comp_run(gcomp, importState, exportState, clock, target_ymd, tar
              call dshr_restart_read(restfilm, rpfile, logunit, my_task, mpicom, sdat, rc)
              if (ChkErr(rc,__LINE__,u_FILE_u)) return
           case('som', 'som_aquap')
-             call docn_datamode_som_restart_read(restfilm, inst_suffix, logunit, my_task, mpicom, sdat)
+             call docn_datamode_som_restart_read(restfilm, rpfile, logunit, my_task, mpicom, sdat)
           end select
        end if
 

diff --git a/dshr/dshr_mod.F90 b/dshr/dshr_mod.F90
@@ -985,10 +985,10 @@ subroutine dshr_restart_read(rest_filem, rpfile, &
     if(shr_strdata_get_stream_count(sdat) <= 0) return
     call ESMF_VMGetCurrent(vm, rc=rc)
     if (ChkErr(rc,__LINE__,u_FILE_u)) return
-    exists = .false.
-    if (trim(rest_filem) == 'none') then
+    inquire(file=trim(rest_filem), exist=exists)
+    if (trim(rest_filem) == 'none' .or. trim(rest_filem) == 'null') then
        if (my_task == main_task) then
-          write(logunit,F00) ' restart filename from rpointer '//trim(rpfile)
+          write(logunit,F00) ' restart filename from rpointer: '//trim(rpfile)
           open(newunit=nu, file=trim(rpfile), form='formatted')
           read(nu, '(a)') rest_filem
           close(nu)