Merge pull request #204 from JohnLCaron/kmp2

reenable native KMP.

Author: JohnLCaron

.idea/artifacts/netchdf_0_6_0.xml

@@ -59,10 +59,10 @@ Also see:
 We use the latest LTS (long term support) Java version, and will not be explicitly supporting older versions.
 Currently that is Java 21.
 
-We also use the latest stable version of Kotlin that is compatible with the Java version. Currently that is Kotlin 2.1.
+We also use the latest stable version of Kotlin that is compatible with the Java version. Currently that is Kotlin 2.1.21.
 
 Gradle is our build system. We will use the latest stable version of Gradle compatible with our Java and Kotlin versions.
-Currently that is Gradle 8.14.
+Currently that is Gradle 8.14.3.
 
 For now, you must download and build the library yourself. Eventually we will publish it to Maven Central.
 The IntelliJ IDE is highly recommended for all JVM development.
@@ -265,7 +265,7 @@ For example, a Variable of datatype Float will return an ArrayFloat, which is Ar
     return data as ArrayUByte. 
   * Netcdf-4 encodes CHAR values as HDF5 string type with elemSize = 1, so we use that convention to detect 
     legacy CHAR variables in HDF5 format. (NC_CHAR should not be used in new Netcdf-4 files, use NC_UBYTE or NC_STRING.) 
-    Variables of type CHAR return data as STRING, since users can use UBYTE if thats what they intend.
+    Variables of type CHAR return data as STRING, since users can use UBYTE if that's what they intend.
   * Netcdf-4/HDF5 String variables may be fixed or variable length. For fixed Strings, we set the size of Datatype.STRING to 
     the fixed size. For both fixed and variable length Strings, the string will be truncated at the first zero byte, if any.
   * HDF4 does not have a STRING type, but does have signed and unsigned CHAR, and signed and unsigned BYTE. 
@@ -318,7 +318,7 @@ isNetcdf4 = true.
     1.  If a group or variable has an attribute with name "_NCProperties", "_Netcdf4Coordinates", "_Netcdf4Dimid" or "_nc3_strict".
     2.  If a variable name starts with "_nc4_non_coord_".
     3.  If a variable has an attrinute named "DIMENSION_LIST with type vlen of reference.
-    4.  If a dimenson name starts with "This is a netCDF dimension but not a netCDF variable"
+    4.  If a dimension name starts with "This is a netCDF dimension but not a netCDF variable"
 
 Other than trying to identify which library wrote the file, Netchdf does not do any special processing for Netcdf4 files,
 except:

.idea/artifacts/netchdf_0_7_0.xml

@@ -9,7 +9,6 @@ version = libs.versions.netchdf.get()
 kotlin {
     jvm()
 
-    /*
     val hostOs = System.getProperty("os.name")
     val arch = System.getProperty("os.arch")
     when {
@@ -29,8 +28,6 @@ kotlin {
         else -> throw GradleException("Host OS is not supported.")
     }
 
-     */
-
     sourceSets {
         val commonMain by getting {
             dependencies {

.idea/gradle.xml

@@ -12,10 +12,9 @@ data class Dimension(val orgName : String, val length : Long, val isShared : Boo
     constructor(len : Int) : this("", len.toLong(), false)
     constructor(len : Long) : this("", len, false)
 
-    // orgName may be different
     override fun equals(other: Any?): Boolean {
         if (this === other) return true
-        if (javaClass != other?.javaClass) return false
+        if (other == null || this::class != other::class) return false
 
         other as Dimension
 
@@ -33,5 +32,4 @@ data class Dimension(val orgName : String, val length : Long, val isShared : Boo
         return result
     }
 
-
 }

Readme.md

@@ -210,7 +210,9 @@ fun getSizeOfNumberOfRecords(
 
 // jhdf
 internal fun bytesNeededToHoldNumber(number: Int): Int {
-    return (Integer.numberOfTrailingZeros(Integer.highestOneBit(number)) + 8) / 8
+    //     return (Integer.numberOfTrailingZeros(Integer.highestOneBit(number)) + 8) / 8
+    val p1 = number.takeHighestOneBit()
+    return (p1.countTrailingZeroBits() + 8) / 8
 }
 
 /* private fun getSizeOfTotalNumberOfChildRecords(nodeSize: Int, depth: Int, recordSize: Int): Int {

core/build.gradle.kts

@@ -63,6 +63,8 @@ internal class BTree2data(
         }
     }
 
+    fun countChunks() = asSequence().count()
+
     fun chunkIterator(): Iterator<DataChunk> = asSequence().iterator()
 
     internal fun findDataChunk(order: Int): DataChunk? {

core/src/commonMain/kotlin/com/sunya/cdm/api/Dimension.kt

@@ -5,7 +5,6 @@ package com.sunya.netchdf.hdf5
 import com.sunya.cdm.api.computeSize
 import com.sunya.cdm.iosp.OpenFileState
 import com.sunya.cdm.util.InternalLibraryApi
-import java.util.*
 
 // DataLayoutExtensibleArray4
 class ExtensibleArrayIndex(val h5: H5builder, address: Long, datasetDimensions: IntArray, chunkDimensions: IntArray) {

core/src/commonMain/kotlin/com/sunya/netchdf/hdf5/BTree2.kt

@@ -7,6 +7,8 @@ import com.sunya.cdm.iosp.OpenFileIF
 import com.sunya.cdm.iosp.OpenFileState
 import com.sunya.cdm.util.*
 
+val UNDEFINED_ADDRESS = -1L
+
 /** Level 1G - Fractal Heap  */
 // TODO rewrite
 internal class FractalHeap(private val h5: H5builder, forWho: String, address: Long) {