w-geo 1.0.52 → 1.0.53

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (30) hide show
  1. package/README.md +1 -1
  2. package/calcLiquefaction-cpt-mat1.xlsx +0 -0
  3. package/calcLiquefaction-cpt-mat2.xlsx +0 -0
  4. package/docs/-_class.mjs.html +1 -1
  5. package/docs/calcDepthStartEndByConnect.mjs.html +1 -1
  6. package/docs/calcDepthStartEndByGroup.mjs.html +1 -1
  7. package/docs/calcDepthStartEndFromCenter.mjs.html +1 -1
  8. package/docs/calcLiquefaction.mjs.html +23 -6
  9. package/docs/calcVerticalStress.mjs.html +1 -1
  10. package/docs/checkDepth.mjs.html +1 -1
  11. package/docs/checkDepthStartEnd.mjs.html +1 -1
  12. package/docs/complementDepthData.mjs.html +1 -1
  13. package/docs/groupByDepthStartEnd.mjs.html +1 -1
  14. package/docs/index.html +1 -1
  15. package/docs/mergeByDepthStartEnd.mjs.html +1 -2
  16. package/docs/relaPlasticityParams.mjs.html +1 -1
  17. package/docs/relaPorousParams.mjs.html +1 -1
  18. package/docs/sepDepthStartEndByDepth.mjs.html +1 -1
  19. package/docs/smoothDepthByKey.mjs.html +1 -1
  20. package/docs/w-geo.html +2 -2
  21. package/package.json +1 -1
  22. package/src/calcLiquefaction.mjs +22 -5
  23. package/src/mergeByDepthStartEnd.mjs +0 -1
  24. package/test/calcLiquefaction-cpt-rowsOut1.json +1 -1
  25. package/test/calcLiquefaction-cpt-rowsOut2.json +1 -1
  26. package/test/calcLiquefaction-spt-rowsIn1.json +1 -1
  27. package/test/calcLiquefaction-spt-rowsOut1.json +1 -1
  28. package/test/calcLiquefaction-spt-rowsOut2.json +1 -1
  29. package/calcCptUnitWeight-cpt-rowsIn1.json +0 -1
  30. package/calcCptUnitWeight-cpt-rowsOut1.json +0 -1
package/README.md CHANGED
@@ -23,5 +23,5 @@ npm i w-geo
23
23
 
24
24
  Add script for w-geo.
25
25
  ```alias
26
- <script src="https://cdn.jsdelivr.net/npm/w-geo@1.0.52/dist/w-geo.umd.js"></script>
26
+ <script src="https://cdn.jsdelivr.net/npm/w-geo@1.0.53/dist/w-geo.umd.js"></script>
27
27
  ```
package/calcLiquefaction-cpt-mat1.xlsx CHANGED
Binary file
package/calcLiquefaction-cpt-mat2.xlsx CHANGED
Binary file
package/docs/-_class.mjs.html CHANGED
@@ -59,7 +59,7 @@
59
59
  <br class="clear">
60
60
 
61
61
  <footer>
62
- Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.10</a> on Thu Oct 13 2022 10:13:58 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
62
+ Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.10</a> on Tue Nov 15 2022 08:53:15 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
63
63
  </footer>
64
64
 
65
65
  <script>prettyPrint();</script>
package/docs/calcDepthStartEndByConnect.mjs.html CHANGED
@@ -322,7 +322,7 @@ export default calcDepthStartEndByConnect
322
322
  <br class="clear">
323
323
 
324
324
  <footer>
325
- Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.10</a> on Thu Oct 13 2022 10:13:58 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
325
+ Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.10</a> on Tue Nov 15 2022 08:53:15 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
326
326
  </footer>
327
327
 
328
328
  <script>prettyPrint();</script>
package/docs/calcDepthStartEndByGroup.mjs.html CHANGED
@@ -566,7 +566,7 @@ export default calcDepthStartEndByGroup
566
566
  <br class="clear">
567
567
 
568
568
  <footer>
569
- Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.10</a> on Thu Oct 13 2022 10:13:58 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
569
+ Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.10</a> on Tue Nov 15 2022 08:53:15 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
570
570
  </footer>
571
571
 
572
572
  <script>prettyPrint();</script>
package/docs/calcDepthStartEndFromCenter.mjs.html CHANGED
@@ -346,7 +346,7 @@ export default calcDepthStartEndFromCenter
346
346
  <br class="clear">
347
347
 
348
348
  <footer>
349
- Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.10</a> on Thu Oct 13 2022 10:13:58 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
349
+ Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.10</a> on Tue Nov 15 2022 08:53:15 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
350
350
  </footer>
351
351
 
352
352
  <script>prettyPrint();</script>
package/docs/calcLiquefaction.mjs.html CHANGED
@@ -6524,9 +6524,17 @@ function liquefaction(kind = 'auto', rows) {
6524
6524
  return rows
6525
6525
  }
6526
6526
 
6527
- function liqParams(kind, waterLevelUsual, waterLevelDesign, rows) {
6527
+ function liqParams(kind, waterLevelUsual, waterLevelDesign, Mw, PGA, vibrationType, rows) {
6528
6528
 
6529
- //waterLevelUsual,waterLevelDesign
6529
+ //複寫各層Mw, PGA, vibrationType, 且此處不檢核交由各列檢核
6530
+ rows = map(rows, (v, k) => {
6531
+ v.Mw = Mw
6532
+ v.PGA = PGA
6533
+ v.vibrationType = vibrationType
6534
+ return v
6535
+ })
6536
+
6537
+ //waterLevelUsual, waterLevelDesign
6530
6538
  waterLevelUsual = cdbl(waterLevelUsual)
6531
6539
  waterLevelDesign = cdbl(waterLevelDesign)
6532
6540
 
@@ -6768,12 +6776,21 @@ function liquefaction(kind = 'auto', rows) {
6768
6776
  return cdbl(v.depthStart)
6769
6777
  })
6770
6778
 
6771
- //waterLevelUsual, 常時地下水位
6779
+ //waterLevelUsual, 常時地下水位, 直接使用最上層數據
6772
6780
  let waterLevelUsual = get(rows, '0.waterLevelUsual', 0)
6773
6781
 
6774
- //waterLevelDesign, 設計地下水位
6782
+ //waterLevelDesign, 設計地下水位, 直接使用最上層數據
6775
6783
  let waterLevelDesign = get(rows, '0.waterLevelDesign', 0)
6776
6784
 
6785
+ //Mw, 地震矩規模, 直接使用最上層數據, 此處不檢核交由各列檢核
6786
+ let Mw = get(rows, '0.Mw', '')
6787
+
6788
+ //PGA, 最大地表加速度(g), 直接使用最上層數據, 此處不檢核交由各列檢核
6789
+ let PGA = get(rows, '0.PGA', '')
6790
+
6791
+ //vibrationType, 振動形式, 直接使用最上層數據, 此處不檢核交由各列檢核
6792
+ let vibrationType = get(rows, '0.vibrationType', '')
6793
+
6777
6794
  // //kind
6778
6795
  // if (kind === 'auto') {
6779
6796
 
@@ -6783,7 +6800,7 @@ function liquefaction(kind = 'auto', rows) {
6783
6800
  // }
6784
6801
 
6785
6802
  //liqParams, 自動計算參數
6786
- rows = liqParams(kind, waterLevelUsual, waterLevelDesign, rows)
6803
+ rows = liqParams(kind, waterLevelUsual, waterLevelDesign, Mw, PGA, vibrationType, rows)
6787
6804
  // console.log('liqParams rows', rows[0])
6788
6805
 
6789
6806
  //liqFS, 各樣本計算安全係數與沉陷
@@ -6901,7 +6918,7 @@ export default calcLiquefaction
6901
6918
  <br class="clear">
6902
6919
 
6903
6920
  <footer>
6904
- Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.10</a> on Thu Oct 13 2022 10:13:58 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
6921
+ Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.10</a> on Tue Nov 15 2022 08:53:15 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
6905
6922
  </footer>
6906
6923
 
6907
6924
  <script>prettyPrint();</script>
package/docs/calcVerticalStress.mjs.html CHANGED
@@ -643,7 +643,7 @@ export default calcVerticalStress
643
643
  <br class="clear">
644
644
 
645
645
  <footer>
646
- Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.10</a> on Thu Oct 13 2022 10:13:58 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
646
+ Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.10</a> on Tue Nov 15 2022 08:53:15 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
647
647
  </footer>
648
648
 
649
649
  <script>prettyPrint();</script>
package/docs/checkDepth.mjs.html CHANGED
@@ -211,7 +211,7 @@ export default checkDepth
211
211
  <br class="clear">
212
212
 
213
213
  <footer>
214
- Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.10</a> on Thu Oct 13 2022 10:13:58 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
214
+ Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.10</a> on Tue Nov 15 2022 08:53:15 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
215
215
  </footer>
216
216
 
217
217
  <script>prettyPrint();</script>
package/docs/checkDepthStartEnd.mjs.html CHANGED
@@ -270,7 +270,7 @@ export default checkDepthStartEnd
270
270
  <br class="clear">
271
271
 
272
272
  <footer>
273
- Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.10</a> on Thu Oct 13 2022 10:13:58 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
273
+ Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.10</a> on Tue Nov 15 2022 08:53:15 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
274
274
  </footer>
275
275
 
276
276
  <script>prettyPrint();</script>
package/docs/complementDepthData.mjs.html CHANGED
@@ -503,7 +503,7 @@ export default complementDepthData
503
503
  <br class="clear">
504
504
 
505
505
  <footer>
506
- Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.10</a> on Thu Oct 13 2022 10:13:58 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
506
+ Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.10</a> on Tue Nov 15 2022 08:53:15 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
507
507
  </footer>
508
508
 
509
509
  <script>prettyPrint();</script>
package/docs/groupByDepthStartEnd.mjs.html CHANGED
@@ -489,7 +489,7 @@ export default groupByDepthStartEnd
489
489
  <br class="clear">
490
490
 
491
491
  <footer>
492
- Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.10</a> on Thu Oct 13 2022 10:13:58 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
492
+ Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.10</a> on Tue Nov 15 2022 08:53:15 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
493
493
  </footer>
494
494
 
495
495
  <script>prettyPrint();</script>
package/docs/index.html CHANGED
@@ -68,7 +68,7 @@
68
68
  <br class="clear">
69
69
 
70
70
  <footer>
71
- Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.10</a> on Thu Oct 13 2022 10:13:58 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
71
+ Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.10</a> on Tue Nov 15 2022 08:53:15 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
72
72
  </footer>
73
73
 
74
74
  <script>prettyPrint();</script>
package/docs/mergeByDepthStartEnd.mjs.html CHANGED
@@ -367,7 +367,6 @@ import checkDepthStartEnd from './checkDepthStartEnd.mjs'
367
367
  *
368
368
  */
369
369
  function mergeByDepthStartEnd(rows, opt = {}) {
370
- // let errs = []
371
370
 
372
371
  //check
373
372
  if (!isearr(rows)) {
@@ -517,7 +516,7 @@ export default mergeByDepthStartEnd
517
516
  <br class="clear">
518
517
 
519
518
  <footer>
520
- Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.10</a> on Thu Oct 13 2022 10:13:58 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
519
+ Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.10</a> on Tue Nov 15 2022 08:53:15 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
521
520
  </footer>
522
521
 
523
522
  <script>prettyPrint();</script>
package/docs/relaPlasticityParams.mjs.html CHANGED
@@ -331,7 +331,7 @@ export default relaPlasticityParams
331
331
  <br class="clear">
332
332
 
333
333
  <footer>
334
- Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.10</a> on Thu Oct 13 2022 10:13:58 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
334
+ Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.10</a> on Tue Nov 15 2022 08:53:15 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
335
335
  </footer>
336
336
 
337
337
  <script>prettyPrint();</script>
package/docs/relaPorousParams.mjs.html CHANGED
@@ -521,7 +521,7 @@ export default relaPorousParams
521
521
  <br class="clear">
522
522
 
523
523
  <footer>
524
- Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.10</a> on Thu Oct 13 2022 10:13:58 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
524
+ Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.10</a> on Tue Nov 15 2022 08:53:15 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
525
525
  </footer>
526
526
 
527
527
  <script>prettyPrint();</script>
package/docs/sepDepthStartEndByDepth.mjs.html CHANGED
@@ -321,7 +321,7 @@ export default sepDepthStartEndByDepth
321
321
  <br class="clear">
322
322
 
323
323
  <footer>
324
- Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.10</a> on Thu Oct 13 2022 10:13:58 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
324
+ Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.10</a> on Tue Nov 15 2022 08:53:15 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
325
325
  </footer>
326
326
 
327
327
  <script>prettyPrint();</script>
package/docs/smoothDepthByKey.mjs.html CHANGED
@@ -277,7 +277,7 @@ export default smoothDepthByKey
277
277
  <br class="clear">
278
278
 
279
279
  <footer>
280
- Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.10</a> on Thu Oct 13 2022 10:13:58 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
280
+ Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.10</a> on Tue Nov 15 2022 08:53:15 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
281
281
  </footer>
282
282
 
283
283
  <script>prettyPrint();</script>
package/docs/w-geo.html CHANGED
@@ -169,7 +169,7 @@
169
169
 
170
170
  <dt class="tag-source">Source:</dt>
171
171
  <dd class="tag-source"><ul class="dummy"><li>
172
- <a href="calcLiquefaction.mjs.html">calcLiquefaction.mjs</a>, <a href="calcLiquefaction.mjs.html#line6837">line 6837</a>
172
+ <a href="calcLiquefaction.mjs.html">calcLiquefaction.mjs</a>, <a href="calcLiquefaction.mjs.html#line6854">line 6854</a>
173
173
  </li></ul></dd>
174
174
 
175
175
 
@@ -8831,7 +8831,7 @@
8831
8831
  <br class="clear">
8832
8832
 
8833
8833
  <footer>
8834
- Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.10</a> on Thu Oct 13 2022 10:13:58 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
8834
+ Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.10</a> on Tue Nov 15 2022 08:53:15 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
8835
8835
  </footer>
8836
8836
 
8837
8837
  <script>prettyPrint();</script>
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "w-geo",
3
- "version": "1.0.52",
3
+ "version": "1.0.53",
4
4
  "main": "dist/w-geo.umd.js",
5
5
  "dependencies": {
6
6
  "decimal.js": "^10.4.2",
package/src/calcLiquefaction.mjs CHANGED
@@ -6480,9 +6480,17 @@ function liquefaction(kind = 'auto', rows) {
6480
6480
  return rows
6481
6481
  }
6482
6482
 
6483
- function liqParams(kind, waterLevelUsual, waterLevelDesign, rows) {
6483
+ function liqParams(kind, waterLevelUsual, waterLevelDesign, Mw, PGA, vibrationType, rows) {
6484
6484
 
6485
- //waterLevelUsual,waterLevelDesign
6485
+ //複寫各層Mw, PGA, vibrationType, 且此處不檢核交由各列檢核
6486
+ rows = map(rows, (v, k) => {
6487
+ v.Mw = Mw
6488
+ v.PGA = PGA
6489
+ v.vibrationType = vibrationType
6490
+ return v
6491
+ })
6492
+
6493
+ //waterLevelUsual, waterLevelDesign
6486
6494
  waterLevelUsual = cdbl(waterLevelUsual)
6487
6495
  waterLevelDesign = cdbl(waterLevelDesign)
6488
6496
 
@@ -6724,12 +6732,21 @@ function liquefaction(kind = 'auto', rows) {
6724
6732
  return cdbl(v.depthStart)
6725
6733
  })
6726
6734
 
6727
- //waterLevelUsual, 常時地下水位
6735
+ //waterLevelUsual, 常時地下水位, 直接使用最上層數據
6728
6736
  let waterLevelUsual = get(rows, '0.waterLevelUsual', 0)
6729
6737
 
6730
- //waterLevelDesign, 設計地下水位
6738
+ //waterLevelDesign, 設計地下水位, 直接使用最上層數據
6731
6739
  let waterLevelDesign = get(rows, '0.waterLevelDesign', 0)
6732
6740
 
6741
+ //Mw, 地震矩規模, 直接使用最上層數據, 此處不檢核交由各列檢核
6742
+ let Mw = get(rows, '0.Mw', '')
6743
+
6744
+ //PGA, 最大地表加速度(g), 直接使用最上層數據, 此處不檢核交由各列檢核
6745
+ let PGA = get(rows, '0.PGA', '')
6746
+
6747
+ //vibrationType, 振動形式, 直接使用最上層數據, 此處不檢核交由各列檢核
6748
+ let vibrationType = get(rows, '0.vibrationType', '')
6749
+
6733
6750
  // //kind
6734
6751
  // if (kind === 'auto') {
6735
6752
 
@@ -6739,7 +6756,7 @@ function liquefaction(kind = 'auto', rows) {
6739
6756
  // }
6740
6757
 
6741
6758
  //liqParams, 自動計算參數
6742
- rows = liqParams(kind, waterLevelUsual, waterLevelDesign, rows)
6759
+ rows = liqParams(kind, waterLevelUsual, waterLevelDesign, Mw, PGA, vibrationType, rows)
6743
6760
  // console.log('liqParams rows', rows[0])
6744
6761
 
6745
6762
  //liqFS, 各樣本計算安全係數與沉陷
package/src/mergeByDepthStartEnd.mjs CHANGED
@@ -323,7 +323,6 @@ import checkDepthStartEnd from './checkDepthStartEnd.mjs'
323
323
  *
324
324
  */
325
325
  function mergeByDepthStartEnd(rows, opt = {}) {
326
- // let errs = []
327
326
 
328
327
  //check
329
328
  if (!isearr(rows)) {