Merge pull request #8 from cd10kfsu/feature/cda/nc_string

Feature/cda/nc string

Author: cd10kfsu

README.md

@@ -96,3 +96,7 @@ config/env.sh sets the required environmental vars used by CMAKE.
    cmake .. -DBUILD_NC=ON -DBUILD_H5=on -DH5_VERSION_1_8=ON -DBUILD_FAST_IO=ON
    make; make test
    ```
+4. Most common combination for Mac ARM (enable hdf5 (version>1.8) & nc, disable hdf4)
+   ```
+   . ../config/env.gnu.mac-arm.sh  &&  cmake .. -DBUILD_NC=ON -DBUILD_H4=OFF -DBUILD_H5=ON -DH5_VERSION_1_8=OFF -DBUILD_FAST_IO=ON && make && make test
+   ```

config/env.gnu.mac-arm.sh

@@ -0,0 +1,43 @@
+##/bin/bash -xe
+
+#FC="mpif90"
+#FC_CFLAGS="-fp-model precise -O2"
+#FC_LFLAGS=""
+
+#ARCHIVER=ar
+#ARCHIEVER_FLAGS= -crvs
+
+# config for F90GIO installation
+#F90GIO_DIR=/Users/cda/Documents/work/lab/F90GIO
+#F90GIO_LIB_DIR=$(F90GIO_DIR)/lib
+#F90GIO_INCLUDE_DIR=$(F90GIO_DIR)/include
+
+# config for Netcdf
+export NC_INCLUDE="/opt/homebrew/Cellar/netcdf-fortran/4.6.1/include"
+export NC_LIBS="-L/opt/homebrew/Cellar/netcdf-fortran/4.6.1/lib -lnetcdff -lnetcdf -lnetcdf"
+
+# config for HDF4 
+export H4_INCLUDE=""
+export H4_LIBS=`h4fc -show TESTSRC | awk -F"TESTSRC " '{print $2}'`
+
+
+# config for HDF5
+export H5_INCLUDE="/opt/homebrew/Cellar/hdf5/1.14.3_1/include"
+#"/opt/homebrew/Cellar/hdf5/1.14.3_1/include"
+export H5_LIBS="-L/opt/homebrew/Cellar/hdf5/1.14.3_1/lib -lhdf5_fortran -lhdf5"
+#/opt/homebrew/Cellar/hdf5/1.14.3_1/lib/libhdf5_hl_fortran.a /opt/homebrew/Cellar/hdf5/1.14.3_1/lib/libhdf5_hl.a /opt/homebrew/Cellar/hdf5/1.14.3_1/lib/libhdf5_fortran.a /opt/homebrew/Cellar/hdf5/1.14.3_1/lib/libhdf5.a "
+
+#-L/opt/homebrew/Cellar/hdf5/1.14.3_1/lib /opt/homebrew/Cellar/hdf5/1.14.3_1/lib/libhdf5_hl_fortran.a /opt/homebrew/Cellar/hdf5/1.14.3_1/lib/libhdf5_hl.a /opt/homebrew/Cellar/hdf5/1.14.3_1/lib/libhdf5_fortran.a /opt/homebrew/Cellar/hdf5/1.14.3_1/lib/libhdf5.a /opt/homebrew/lib/libsz.a -lz -ldl -lm"
+
+
+echo "====================================="
+echo "      F90GIO configurations:"
+echo 
+echo "NC_INCLUDE=$NC_INCLUDE"
+echo "NC_LIBS=$NC_LIBS"
+
+echo "H4_INCLUDE=$H4_INCLUDE"
+echo "H4_LIBS=$H4_LIBS"
+
+echo "H5_INCLUDE=$H5_INCLUDE"
+echo "H5_LIBS=$H5_LIBS"

libsrc/fast/nc/m_ncio.f90

@@ -49,7 +49,7 @@ MODULE m_ncio
 
 ! low-level Read 1D
   PUBLIC :: nc_rdvar1d_i1, nc_rdvar1d_i2, nc_rdvar1d_i4, nc_rdvar1d_r4, &
-            nc_rdvar1d_r8
+            nc_rdvar1d_r8, nc_rdvar1d_str
 ! low-level Read 2D
   PUBLIC :: nc_rdvar2d_i1, nc_rdvar2d_i2, nc_rdvar2d_i4, nc_rdvar2d_r4, &
             nc_rdvar2d_r8
@@ -312,6 +312,15 @@ SUBROUTINE nc_rdvar1d_r8(fid, varname, varval)
   include "nc_rdvar.f90.inc"
 END SUBROUTINE 
 
+SUBROUTINE nc_rdvar1d_str(fid, varname, varval)
+  IMPLICIT NONE
+  INTEGER(i4),INTENT(IN) :: fid
+  CHARACTER(*),INTENT(IN) :: varname
+  CHARACTER(*), INTENT(INOUT) :: varval(:)
+  include "nc_rdvar.f90.inc"
+END SUBROUTINE 
+
+
 
 !--------------------------------------------------------------------------------
 ! write 1D
@@ -400,6 +409,7 @@ SUBROUTINE nc_rdvar2d_r8(fid, varname, varval)
   include "nc_rdvar.f90.inc"
 END SUBROUTINE 
 
+
 !--------------------------------------------------------------------------------
 ! write 2D
 !--------------------------------------------------------------------------------