Update the merge command for v102.0 #251
Open
Conversation
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
wangliang1989
changed the title
|
@seisman 你说的那个换行的问题，如果不换行，pdf编译出来有问题，所以我还是换了行 |
|
为何要关闭原始 PR 开一个新 PR? |
历史乱了 |
|
所有的 PR 在 merge 到 master 时都会被压缩成一个 commit，所以 PR 中的历史再乱都没有影响。 |
还包含了Mac安装sac等内容 |
seisman
reviewed
Jun 15, 2021
Co-authored-by: Dongdong Tian <[email protected]>
Co-authored-by: Dongdong Tian <[email protected]>
Co-authored-by: Dongdong Tian <[email protected]>
Co-authored-by: Dongdong Tian <[email protected]>
Co-authored-by: Dongdong Tian <[email protected]>
seisman
changed the title
Co-authored-by: Dongdong Tian <[email protected]>
seisman
reviewed
Jun 16, 2021
Comment on lines
+55
to
+62
| 将要合并的、时间上相邻的前后两个文件之间是存在时间间隔的， | ||
| 即前一个文件的最后一个采样点和后一个文件的第一个采样点之间存在时间间隔。 | ||
| 理想情况下，这个时间间隔应该和头段变量 \ ``delta``\ 相等。 | ||
| 然而，实际情况二者可能不想等。如果二者的差异不大于 TOLERANCE_DELTA 给定的值（或其默认值）， | ||
| SAC 会认为二者没有差异，即便有也是数值计算造成的。 | ||
| 当 SAC 文件的采样很高，或者数据的总持续时间很长就会出现这样的情况。 | ||
| 如果二者差异大于了 TOLERANCE_DELTA 给定的值（或其默认值）， | ||
| SAC 会认为数据存在间断（GAP）或重叠（OVERLAP），会按照GAP或OVERLAP两个选项进行处理。 |
Co-authored-by: Dongdong Tian <[email protected]>
Co-authored-by: Dongdong Tian <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.