Merge pull request #595 from EarthyScience/jp/nc_chunk_fix

Netcdf chunked grab fix

Author: TheJeran

src/components/ui/Colorbar.tsx

@@ -76,14 +76,14 @@ const Colorbar = ({units, metadata, valueScales} : {units: string, metadata: Rec
         origMax: valueScales.maxVal
     }),[valueScales])
     const range = origMax - origMin
-    const zeroPoint = (0 - origMin) / range; // Used to account for shifting values
+
     const [tickCount, setTickCount] = useState<number>(5)
     const [newMin, setNewMin] = useState(origMin)
     const [newMax, setNewMax] = useState(origMax)
-    const [displayMin, setDisplayMin] = useState(Num2String(origMin))
-    const [displayMax, setDisplayMax] = useState(Num2String(origMax))
+    const [displayMin, setDisplayMin] = useState(Num2String(origMin*Math.pow(10, scalingFactor??0)))
+    const [displayMax, setDisplayMax] = useState(Num2String(origMax*Math.pow(10, scalingFactor??0)))
     const prevVals = useRef<{ min: number | null; max: number | null }>({ min: null, max: null });
-
+    
     const colors = useMemo(()=>{
         const sourceData = colormap.source.data;
         if (!sourceData || !sourceData.data) {
@@ -162,11 +162,11 @@ const Colorbar = ({units, metadata, valueScales} : {units: string, metadata: Rec
     },[newMin, newMax])
 
     useEffect(()=>{ // Update internal vals when global vals change
-        setDisplayMin(Num2String(origMin))
-        setDisplayMax(Num2String(origMax))
+        setDisplayMin(Num2String(origMin*Math.pow(10, scalingFactor??0)))
+        setDisplayMax(Num2String(origMax*Math.pow(10, scalingFactor??0)))
         setNewMin(origMin)
         setNewMax(origMax)
-    },[origMax, origMin])
+    },[origMax, origMin, scalingFactor])
 
     useEffect(() => {
         if (canvasRef.current) {
@@ -181,7 +181,6 @@ const Colorbar = ({units, metadata, valueScales} : {units: string, metadata: Rec
         }
     }, [colors]);
     const analysisString = useMemo(()=>{
-        
         if (analysisMode){
             const twoVar = variable2 != "Default";
             const thisOperation = (operation === "Convolution") ? kernelOperation : operation
@@ -192,6 +191,7 @@ const Colorbar = ({units, metadata, valueScales} : {units: string, metadata: Rec
             return `[${units}]`
         }
     },[analysisMode, execute])
+
     return (
         <>
         <div className='colorbar' >

src/components/zarr/NCGetters.ts

@@ -167,7 +167,7 @@ export async function GetNCArray(variable: string){
                     const getStartsAndCounts = () => {
                         const starts = new Array(rank).fill(0);
                         const counts = new Array(rank).fill(1);
-                        if (rank > 3) { //When rank is 4 or 5. The first will always be depth. In the case of 5 that will only be if last dimension is vector variable
+                        if (rank > 3) { //When rank is 4 or 5. The first will always be depth. In the case of 5 that will only be if last dimension is vector variable. This case not handled yet
                             starts[0] = idx4D; 
                             counts[0] = 1;
                         }
@@ -220,23 +220,22 @@ export async function GetNCArray(variable: string){
                         chunkF16 = coarsen3DArray(chunkF16, chunkShape, chunkStride as [number, number, number], kernelSize, kernelDepth, newSize)
                         chunkStride = calculateStrides(thisShape)
                     }
-                    if (newScalingFactor != null && newScalingFactor != scalingFactor){ // If the scalingFactor has changed, need to rescale main array
-                        if (scalingFactor == null || newScalingFactor > scalingFactor){ 
-                            const thisScaling = scalingFactor ? newScalingFactor - scalingFactor : newScalingFactor
-                            RescaleArray(typedArray, thisScaling)
-                            scalingFactor = newScalingFactor
-                            for (const id of rescaleIDs){ // Set new scalingFactor on the chunks
-                                const tempName = `${cacheBase}_chunk_${id}`
-                                const tempChunk = cache.get(tempName)
-                                tempChunk.scaling = scalingFactor
-                                RescaleArray(tempChunk.data, thisScaling)
-                                cache.set(tempName, tempChunk)
-                            }
+                    if (newScalingFactor != null 
+                        && newScalingFactor != scalingFactor){ // If the scalingFactor has changed, need to rescale main array. Not worried about shrinking values at the moment. 
+                        const thisScaling = scalingFactor ? newScalingFactor - scalingFactor : newScalingFactor
+                        RescaleArray(typedArray, thisScaling)
+                        scalingFactor = newScalingFactor
+                        for (const id of rescaleIDs){ // Set new scalingFactor on the chunks
+                            const tempName = `${cacheBase}_chunk_${id}`
+                            const tempChunk = cache.get(tempName)
+                            tempChunk.scaling = scalingFactor
+                            RescaleArray(tempChunk.data, thisScaling)
+                            cache.set(tempName, tempChunk)
                         }
                     }
                     if (hasZ)copyChunkToArray(
                         chunkF16,
-                        thisShape,
+                        chunkShape,
                         chunkStride as [number, number, number],
                         typedArray,
                         outputShape,
@@ -246,7 +245,7 @@ export async function GetNCArray(variable: string){
                     )
                     else copyChunkToArray2D(
                         chunkF16,
-                        thisShape,
+                        chunkShape,
                         chunkStride as [number, number],
                         typedArray,
                         outputShape,

src/components/zarr/ZarrLoaderLRU.ts

@@ -32,8 +32,9 @@ export function ToFloat16(array : Float32Array, scalingFactor: number | null) :
 	const additionalScaling = Math.ceil(Math.log10(maxVal/65504))
 	const needsRescale =
 		additionalScaling > 0 ||
-		additionalScaling <= -6 ||
-		(scalingFactor && scalingFactor <= -6 && additionalScaling < 0)
+		additionalScaling <= -6
+		//I think this is complicating things. Because if it was already scaled then there should already by enough variance in the data it doesn't need to go further
+		// (scalingFactor && scalingFactor <= -6 && additionalScaling < 0) 
 	const newScalingFactor = needsRescale ?
 		additionalScaling + initialScale :
 		initialScale
@@ -43,7 +44,7 @@ export function ToFloat16(array : Float32Array, scalingFactor: number | null) :
 	for (let i = 0; i < array.length; i++) {
 		newArray[i] = array[i] * multiplier;
 	}
-	return [newArray, newScalingFactor]
+	return [newArray, newScalingFactor != 0 ? newScalingFactor : null]
 }
 
 export function testToFloat16(){
@@ -67,8 +68,9 @@ export function testToFloat16(){
 
 
 export function RescaleArray(array: Float16Array, scalingFactor: number){ // Rescales built array when new chunk has higher scalingFactor
+	const multipler = 1/Math.pow(10,scalingFactor)
 	for (let i = 0; i < array.length; i++) {
-		array[i] /= Math.pow(10,scalingFactor);
+		array[i] *= multipler;
 	}
 }
 

src/utils/HelperFuncs.ts

@@ -58,7 +58,7 @@ export function parseTimeUnit(units: string | undefined): [number, number] {
     let baseDate;
     if (referenceDate.length <= 10){
       const [year, month, day] = referenceDate.split('-');
-      baseDate = new Date(Date.UTC(parseInt(year),parseInt(month),parseInt(day)))
+      baseDate = new Date(Date.UTC(parseInt(year),parseInt(month)-1,parseInt(day)))
     } else {
      baseDate = referenceDate ? new Date(referenceDate) : new Date();
     }