diff --git a/src/icebergs.F90 b/src/icebergs.F90 index 797fd85..be586b7 100644 --- a/src/icebergs.F90 +++ b/src/icebergs.F90 @@ -160,11 +160,7 @@ subroutine icebergs_init(bergs, & call read_restart_bonds(bergs,Time) endif call update_halo_icebergs(bergs) - if (bergs%manually_initialize_bonds) then - call initialize_iceberg_bonds(bergs) - else - call read_restart_bonds(bergs,Time) - endif + if (bergs%manually_initialize_bonds) call initialize_iceberg_bonds(bergs) if (bergs%mts) then call transfer_mts_bergs(bergs) else diff --git a/src/icebergs_io.F90 b/src/icebergs_io.F90 index 8c4b608..0cfaa40 100644 --- a/src/icebergs_io.F90 +++ b/src/icebergs_io.F90 @@ -1406,7 +1406,7 @@ subroutine read_restart_bonds(bergs,Time) call form_a_bond(first_berg, other_id(k), other_berg_ine(k), other_berg_jne(k), second_berg) number_perfect_bonds=number_perfect_bonds+1 - current_bond=>this%first_bond + current_bond=>first_berg%first_bond if (dem) then current_bond%tangd1=tangd1(k) diff --git a/tests/dem_ground_frac_test/input.nml b/tests/dem_ground_frac_test/input.nml index bcc2b3e..4bce62c 100644 --- a/tests/dem_ground_frac_test/input.nml +++ b/tests/dem_ground_frac_test/input.nml @@ -141,8 +141,8 @@ ignore_missing_restart_bergs=.False. !(F) 'T'=ignore missing bergs in restart require_restart=.true. !(F) 'T'=fail if the restart file is not present at start use_slow_find=.true. !(T) Use slow, but robust, find_cell for reading restarts - manually_initialize_bonds=.true. ! (F) True= Bonds are initialize manually. - manually_initialize_bonds_from_radii=.true. + manually_initialize_bonds=.false.!.true. ! (F) True= Bonds are initialize manually. + manually_initialize_bonds_from_radii=.false.!.true. !length_for_manually_initialize_bonds=800.0 !(1e3)Dist b/w bergs to init bonds manually ignore_ij_restart=.true. !(F) ign. cell from restart,useful for restart on diff grid generate_test_icebergs=.false. ! (F) Create ergs in absence of a restart file