Logic fix restarting with a prior case's restart

Merge branch 'restart_bugfix'

fix to properly restart when using finidat from a prior case

Fixes: NGT-ED Github issue #165

User interface changes?: No

Code review: ckoven, rgknox

Testing:
  ckoven:
    Test suite: ED test suite on lawrencium-lr3
    Test baseline: don't have any recent baselines, so didn't run; I can't imagine this would be an issue but please double-check when testing on Yellowstone
    Test namelist changes: none
    Test answer changes: ought to be b4b
    Test summary: all smoke, restart, etc tests pass

  andre:
    Test suite: ed - yellowstone gnu, intel, pgi
                     hobart nag
    Test baseline: ed-clm-7f67d19
    Test namelist changes: none
    Test answer changes: bit for bit
    Test summary: all tests pass

    Test suite: clm_short - yellowstone gnu, intel, pgi
    Test baseline: clm4_5_12_r195
    Test namelist changes: none
    Test answer changes: bit for bit
    Test summary: all tests pass

components/clm/src/main/clm_initializeMod.F90

@@ -647,7 +647,7 @@ subroutine initialize2( )
     ! Initialise the ED model state structure
     ! --------------------------------------------------------------
 
-    if ( use_ed .and. .not.is_restart() ) then
+    if ( use_ed .and. .not.is_restart() .and. finidat == ' ') then
 
        call clm_fates%init_coldstart(waterstate_inst,canopystate_inst)