-
Notifications
You must be signed in to change notification settings - Fork 21
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
added test dem_test_contact, for varying L_ij, the critical-interacti…
…ve-length scale, for MTS-DEM simulations. Artifically increasing L_ij is needed to prevent overlapping of conglomerates under contact if their particle radii are low. Also added long_run_no_inc_contact_dist.sh and .nml in tests/a68, to test A68a test without increaing L_ij (it has essentially no effect, given the large particle radii). Some edits to icebergs.F90 to increase computational efficiency.
- Loading branch information
Showing
15 changed files
with
928 additions
and
75 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| #!/bin/bash | ||
|
|
||
| Rearth=6363827 | ||
| odrag=(17.8) | ||
| ss=90 | ||
| name=(lrun_nicd_od_17.8_tn_ng_ydn.1_ss90_ns18_rx-37.51_ry-55.2166) | ||
| ibdt=1800.0 | ||
|
|
||
| gcoef=(1.e4) | ||
| nstress=(18) | ||
| A68dx=-37.51 | ||
| A68dy=-55.2166 | ||
|
|
||
| odrag=(10.35) | ||
| ss=180 | ||
| name=(lrun_nicd_hrtest) | ||
| ibdt=3600.0 | ||
| nstress=(24.) #(22.5) | ||
| A68dx=-37.5 | ||
| A68dy=-55.1 | ||
|
|
||
| for ((i = 0; i < ${#odrag[@]}; ++i)); do | ||
| drag=(${odrag[$i]}) | ||
| fname=(${name[$i]}) | ||
| gc=(${gcoef[$i]}) | ||
| ns=(${nstress[$i]}) | ||
|
|
||
| echo $drag | ||
| echo $fname | ||
| echo $Rearth | ||
| echo $ss | ||
| echo $A68dx | ||
| echo $A68dy | ||
| echo $ns | ||
|
|
||
| sed "s/<od>/$drag/; s/<re>/$Rearth/; s/<ss>/$ss/; s/<ns>/$ns/; s/<gc>/$gc/; s/<xd>/$A68dx/; s/<yd>/$A68dy/; s/<ibdt>/$ibdt/; s/<name>/$fname/g" \ | ||
| long_run_no_inc_contact_dist.nml > input.nml | ||
| ./RUN1p | ||
| # &>/dev/null & | ||
| done |
Oops, something went wrong.