Skip to content

Commit

Permalink
partial fix for bond restart
Browse files Browse the repository at this point in the history
  • Loading branch information
alex-huth committed Feb 19, 2021
1 parent decca5c commit b705b60
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 8 deletions.
6 changes: 1 addition & 5 deletions src/icebergs.F90
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/icebergs_io.F90
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions tests/dem_ground_frac_test/input.nml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit b705b60

Please sign in to comment.