w-geo 1.1.21 → 1.1.22

package/docs/-_class.mjs.html

@@ -62,7 +62,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Wed May 08 2024 22:17:07 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Wed May 08 2024 22:43:47 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/calcDepthByDepthStartEnd.mjs.html

@@ -233,7 +233,7 @@ export default calcDepthByDepthStartEnd
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Wed May 08 2024 22:17:07 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Wed May 08 2024 22:43:47 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/calcDepthStartEndByConnect.mjs.html

@@ -322,7 +322,7 @@ export default calcDepthStartEndByConnect
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Wed May 08 2024 22:17:07 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Wed May 08 2024 22:43:47 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/calcDepthStartEndByDepth.mjs.html

@@ -347,7 +347,7 @@ export default calcDepthStartEndByDepth
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Wed May 08 2024 22:17:07 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Wed May 08 2024 22:43:47 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/calcDepthStartEndByGroup.mjs.html

@@ -566,7 +566,7 @@ export default calcDepthStartEndByGroup
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Wed May 08 2024 22:17:07 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Wed May 08 2024 22:43:47 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/calcLiquefaction.mjs.html

@@ -7801,7 +7801,7 @@ export default calcLiquefaction
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Wed May 08 2024 22:17:07 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Wed May 08 2024 22:43:47 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/calcVerticalStress.mjs.html

@@ -733,7 +733,7 @@ export default { //整合輸出預設得要有default
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Wed May 08 2024 22:17:07 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Wed May 08 2024 22:43:47 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/checkDepth.mjs.html

@@ -214,7 +214,7 @@ export default checkDepth
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Wed May 08 2024 22:17:07 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Wed May 08 2024 22:43:47 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/checkDepthStartEnd.mjs.html

@@ -273,7 +273,7 @@ export default checkDepthStartEnd
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Wed May 08 2024 22:17:07 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Wed May 08 2024 22:43:47 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/complementDepthData.mjs.html

@@ -506,7 +506,7 @@ export default complementDepthData
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Wed May 08 2024 22:17:07 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Wed May 08 2024 22:43:47 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/groupByDepthStartEnd.mjs.html

@@ -492,7 +492,7 @@ export default groupByDepthStartEnd
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Wed May 08 2024 22:17:07 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Wed May 08 2024 22:43:47 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/index.html

@@ -71,7 +71,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Wed May 08 2024 22:17:07 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Wed May 08 2024 22:43:47 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/mergeByDepthStartEnd.mjs.html

@@ -907,7 +907,7 @@ export default mergeByDepthStartEnd
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Wed May 08 2024 22:17:07 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Wed May 08 2024 22:43:47 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/relaPlasticityParams.mjs.html

@@ -334,7 +334,7 @@ export default relaPlasticityParams
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Wed May 08 2024 22:17:07 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Wed May 08 2024 22:43:47 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/relaPorousParams.mjs.html

@@ -524,7 +524,7 @@ export default relaPorousParams
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Wed May 08 2024 22:17:07 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Wed May 08 2024 22:43:47 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/sepDepthStartEndByDepth.mjs.html

@@ -324,7 +324,7 @@ export default sepDepthStartEndByDepth
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Wed May 08 2024 22:17:07 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Wed May 08 2024 22:43:47 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/smoothDepthByKey.mjs.html

@@ -280,7 +280,7 @@ export default smoothDepthByKey
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Wed May 08 2024 22:17:07 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Wed May 08 2024 22:43:47 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/w-geo.html

@@ -9658,7 +9658,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Wed May 08 2024 22:17:07 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Wed May 08 2024 22:43:47 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/g_8_1-dtIntrpPsdBySize.mjs

@@ -31,7 +31,7 @@ let psizes = [
 
 let fss = dtIntrpPsdBySize(dt, psizes)
 console.log('fss', fss)
-// => [
+// => fss [
 //   { size: 630, fraction: 100 },
 //   { size: 200, fraction: 100 },
 //   { size: 63, fraction: 99.99999999999999 },

package/g_8_1-dtIntrpPsdContentIso.mjs

@@ -0,0 +1,46 @@
+import fs from 'fs'
+import _ from 'lodash-es'
+import w from 'wsemi'
+import dtIntrpPsdContentIso from './src/dtIntrpPsdContentIso.mjs'
+
+
+let dt = {
+    GSD: `[101.6, 76.2, 50.8, 25.4, 19.0, 9.5, 4.75, 2.0, 0.85, 0.425, 0.25, 0.15, 0.106, 0.075, 0.027, 0.018, 0.011, 0.008, 0.006, 0.003, 0.001, 0.0, 0.0, 0.0]`,
+    GSP: `[100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, -1.0, 100.0, 99.0, 96.0, 86.0, 74.0, 61.0, 51.0, 32.0, 16.0, 0.0, 0.0, 0.0]`,
+}
+console.log('dt', dt)
+// => dt {
+//   GSD: '[101.6, 76.2, 50.8, 25.4, 19.0, 9.5, 4.75, 2.0, 0.85, 0.425, 0.25, 0.15, 0.106, 0.075, 0.027, 0.018, 0.011, 0.008, 0.006, 0.003, 0.001, 0.0, 0.0, 0.0]',
+//   GSP: '[100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, -1.0, 100.0, 99.0, 96.0, 86.0, 74.0, 61.0, 51.0, 32.0, 16.0, 0.0, 0.0, 0.0]'
+// }
+
+let psizes = [
+    630,
+    200,
+    63,
+    20,
+    6.3,
+    2,
+    0.63,
+    0.2,
+    0.063,
+    0.02,
+    0.0063,
+    0.002,
+]
+
+let dtn = dtIntrpPsdContentIso(dt, psizes)
+console.log('dtn', dtn)
+// => dtn {
+//   GSD: '[101.6, 76.2, 50.8, 25.4, 19.0, 9.5, 4.75, 2.0, 0.85, 0.425, 0.25, 0.15, 0.106, 0.075, 0.027, 0.018, 0.011, 0.008, 0.006, 0.003, 0.001, 0.0, 0.0, 0.0]',
+//   GSP: '[100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, -1.0, 100.0, 99.0, 96.0, 86.0, 74.0, 61.0, 51.0, 32.0, 16.0, 0.0, 0.0, 0.0]',
+//   ctCoarseISO: 2,
+//   ctGravelISO: 0,
+//   ctSandISO: 2,
+//   ctFineISO: 98,
+//   ctSiltISO: 72,
+//   ctClayISO: 26
+// }
+
+
+//node --experimental-modules g_8_1-dtIntrpPsdContentIso.mjs

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "w-geo",
-  "version": "1.1.21",
+  "version": "1.1.22",
   "main": "dist/w-geo.umd.js",
   "dependencies": {
     "decimal.js": "^10.4.3",

package/src/WGeo.mjs

@@ -26,6 +26,7 @@ export { default as checkDepthStartEnd } from './checkDepthStartEnd.mjs'
 export { default as cnst } from './cnst.mjs'
 export { default as complementDepthData } from './complementDepthData.mjs'
 export { default as dtIntrpPsdBySize } from './dtIntrpPsdBySize.mjs'
+export { default as dtIntrpPsdContentIso } from './dtIntrpPsdContentIso.mjs'
 export { default as getCptDepthHcOpt } from './getCptDepthHcOpt.mjs'
 export { default as getDepthMaxMin } from './getDepthMaxMin.mjs'
 export { default as groupByDepthStartEnd } from './groupByDepthStartEnd.mjs'

package/src/dtIntrpPsdContentIso.mjs

@@ -0,0 +1,109 @@
+import get from 'lodash-es/get.js'
+import find from 'lodash-es/find.js'
+import round from 'lodash-es/round.js'
+import size from 'lodash-es/size.js'
+import isnum from 'wsemi/src/isnum.mjs'
+import isestr from 'wsemi/src/isestr.mjs'
+import cdbl from 'wsemi/src/cdbl.mjs'
+import dtIntrpPsdBySize from './dtIntrpPsdBySize.mjs'
+
+
+function dtIntrpPsdContentIso(dt, opt = {}) {
+
+    //keySize
+    let keySize = get(opt, 'keySize', '')
+    if (!isestr(keySize)) {
+        keySize = 'size'
+    }
+
+    //keyFraction
+    let keyFraction = get(opt, 'keyFraction', '')
+    if (!isestr(keyFraction)) {
+        keyFraction = 'fraction'
+    }
+
+    //dtIntrpPsdBySize
+    let psizes = [
+        630,
+        200,
+        63,
+        20,
+        6.3,
+        2,
+        0.63,
+        0.2,
+        0.063,
+        0.02,
+        0.0063,
+        0.002,
+    ]
+    let psds = dtIntrpPsdBySize(dt, psizes, { keySize, keyFraction })
+    // console.log('psds', psds)
+
+    //check
+    if (size(psds) === 0) {
+        console.log('dt', dt)
+        console.log('psizes', psizes)
+        console.log('keySize', keySize)
+        console.log('keyFraction', keyFraction)
+        throw new Error('invalid PSD')
+    }
+
+    //1e20->2: 礫石
+    //2->0.063: 砂
+    //0.063->0.02: 粉土
+    //0.02->0: 黏土
+    let p2 = find(psds, { size: 2 })
+    let p0063 = find(psds, { size: 0.063 })
+    // let p0005 = find(psds, { size: 0.005 })
+    let p0002 = find(psds, { size: 0.002 })
+    let f2 = get(p2, 'fraction')
+    let f0063 = get(p0063, 'fraction')
+    // let f0005 = get(p0005, 'fraction')
+    let f0002 = get(p0002, 'fraction')
+    // console.log('p2', p2, 'p0063', p0063, 'p0002', p0002)
+    // console.log('f2', f2, 'f0063', f0063, 'f0002', f0002)
+
+    //check
+    if (!isnum(f2)) {
+        throw new Error('invalid PSD in 2mm')
+    }
+    if (!isnum(f0063)) {
+        throw new Error('invalid PSD in 0.063mm')
+    }
+    if (!isnum(f0002)) {
+        throw new Error('invalid PSD in 0.002mm')
+    }
+    f2 = cdbl(f2)
+    f0063 = cdbl(f0063)
+    f0002 = cdbl(f0002)
+    // console.log('f2', f2, 'f0063', f0063, 'f0002', f0002)
+
+    //ctGravelISO, ctSandISO, ctFineISO, ctClayISO, 四捨五入可能會導致4項總和非100%
+    let ctGravelISO = 100 - f2
+    ctGravelISO = round(ctGravelISO)
+    let ctSandISO = f2 - f0063
+    ctSandISO = round(ctSandISO)
+    let ctSiltISO = f0063 - f0002
+    ctSiltISO = round(ctSiltISO)
+    let ctClayISO = f0002
+    ctClayISO = round(ctClayISO)
+    // console.log('ctGravelISO', ctGravelISO, 'ctSandISO', ctSandISO, 'ctSiltISO', ctSiltISO, 'ctClayISO', ctClayISO)
+
+    //add prop.
+    dt.ctCoarseISO = ctGravelISO + ctSandISO
+    dt.ctGravelISO = ctGravelISO
+    dt.ctSandISO = ctSandISO
+    dt.ctFineISO = ctSiltISO + ctClayISO
+    dt.ctSiltISO = ctSiltISO
+    dt.ctClayISO = ctClayISO
+    // console.log('ctGravel Ori', dt.ctGravel, 'New', ctGravelISO)
+    // console.log('ctSand Ori', dt.ctSand, 'New', ctSandISO)
+    // console.log('ctFine Ori', (cdbl(dt.ctSilt) + cdbl(dt.ctClay)), 'New', ctFineISO)
+    // console.log('ctClay Ori', dt.ctClay, 'New', ctClayISO)
+
+    return dt
+}
+
+
+export default dtIntrpPsdContentIso

package/test/dtIntrpPsdContentIso.test.mjs

@@ -0,0 +1,46 @@
+import assert from 'assert'
+import _ from 'lodash-es'
+import w from 'wsemi'
+import dtIntrpPsdContentIso from '../src/dtIntrpPsdContentIso.mjs'
+
+
+describe(`dtIntrpPsdContentIso`, function() {
+
+    let dt = {
+        GSD: `[101.6, 76.2, 50.8, 25.4, 19.0, 9.5, 4.75, 2.0, 0.85, 0.425, 0.25, 0.15, 0.106, 0.075, 0.027, 0.018, 0.011, 0.008, 0.006, 0.003, 0.001, 0.0, 0.0, 0.0]`,
+        GSP: `[100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, -1.0, 100.0, 99.0, 96.0, 86.0, 74.0, 61.0, 51.0, 32.0, 16.0, 0.0, 0.0, 0.0]`,
+    }
+
+    let psizes = [
+        630,
+        200,
+        63,
+        20,
+        6.3,
+        2,
+        0.63,
+        0.2,
+        0.063,
+        0.02,
+        0.0063,
+        0.002,
+    ]
+    // let fss = dtIntrpPsdContentIso(dt, psizes)
+
+    let out1 = {
+        GSD: '[101.6, 76.2, 50.8, 25.4, 19.0, 9.5, 4.75, 2.0, 0.85, 0.425, 0.25, 0.15, 0.106, 0.075, 0.027, 0.018, 0.011, 0.008, 0.006, 0.003, 0.001, 0.0, 0.0, 0.0]',
+        GSP: '[100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, -1.0, 100.0, 99.0, 96.0, 86.0, 74.0, 61.0, 51.0, 32.0, 16.0, 0.0, 0.0, 0.0]',
+        ctCoarseISO: 2,
+        ctGravelISO: 0,
+        ctSandISO: 2,
+        ctFineISO: 98,
+        ctSiltISO: 72,
+        ctClayISO: 26
+    }
+    it(`should return ${out1} when dtIntrpPsdContentIso(dt, ${psizes})`, function() {
+        let r = dtIntrpPsdContentIso(dt, psizes)
+        let rr = out1
+        assert.strict.deepStrictEqual(r, rr)
+    })
+
+})