Merge branch 'feature/cd_standalone_config' into feature/cd_AirCraft_…

…STAR
JCSDA · Aug 12, 2024 · feff9fb · feff9fb
2 parents f390236 + d79de6f
commit feff9fb
Show file tree

Hide file tree

Showing 7 changed files with 929 additions and 727 deletions.
diff --git a/configuration/gfortran-debug.setup b/configuration/gfortran-debug.setup
@@ -11,8 +11,9 @@ if [[ "$uname" == "Linux"  ]] ; then
 		export NC4_DIR=/usr/local/ #singularity container only
 		export HDF_DIR=/usr/local/ #singularity container only
 elif [[ "$uname" == "Darwin" ]] ; then
-		export NC4_DIR="/usr/local/Cellar/netcdf/4.8.0_2"  #mac OS, brew install
-		export HDF_DIR="/usr/local/Cellar/hdf5/1.12.1"   #mac OS, brew install
+		export NC4_DIR="/usr/local/Cellar/netcdf/4.9.2_1"  #mac OS, brew install
+		export NC4F_DIR="/usr/local/Cellar/netcdf-fortran/4.6.1"  #mac OS, brew install
+		export HDF_DIR="/usr/local/Cellar/hdf5/1.14.3_1"   #mac OS, brew install
 fi
 
 #set the number of openmp threads
@@ -38,9 +39,11 @@ export LIBS=""
 
 if [[ "$uname" == "Darwin" ]] || [[ "$uname" == "Linux" ]] ; then #mac OS, brew install or Linux (singularity)
 		export LIBS="\
-  -L $NC4_DIR/lib -lnetcdf -lnetcdff \
+  -L $NC4_DIR/lib -lnetcdf \
+  -L $NC4F_DIR/lib -lnetcdff \
   -L $HDF_DIR/lib -lhdf5 \
   -I $NC4_DIR/include \
+  -I $NC4F_DIR/include \
   -I $HDF_DIR/include "
 else
 	export LIBS=""

diff --git a/configuration/gfortran.setup b/configuration/gfortran.setup
@@ -11,8 +11,9 @@ if [[ "$uname" == "Linux"  ]] ; then
 		export NC4_DIR=/usr/local #singularity container only
 		export HDF_DIR=/usr/local #singularity container only
 elif [[ "$uname" == "Darwin" ]] ; then
-		export NC4_DIR="/usr/local/Cellar/netcdf/4.8.0_2"  #mac OS (brew install)
-		export HDF_DIR="/usr/local/Cellar/hdf5/1.12.1"   #mac OS (brew install)
+		export NC4_DIR="/usr/local/Cellar/netcdf/4.9.2_1"
+	        export NC4F_DIR="/usr/local/Cellar/netcdf-fortran/4.6.1"  #mac OS (brew install)
+		export HDF_DIR="/usr/local/Cellar/hdf5/1.14.3_1"   #mac OS (brew install)
 fi
 
 #set the number of openmp threads
@@ -38,8 +39,10 @@ export LIBS=""
 
 if [[ "$uname" == "Darwin" ]] || [[ "$uname" == "Linux" ]] ; then #mac OS, brew install or linux (singularity) 
 		export LIBS="\
-  -L $NC4_DIR/lib -lnetcdf -lnetcdff \
+  -L $NC4_DIR/lib -lnetcdf \
+  -L $NC4F_DIR/lib -lnetcdff \
   -L $HDF_DIR/lib -lhdf5 \
+  -I $NC4F_DIR/include \
   -I $NC4_DIR/include \
   -I $HDF_DIR/include "
 else

diff --git a/src/Build/VERSION.cmake b/src/Build/VERSION.cmake
@@ -3,5 +3,5 @@
 # This software is licensed under the terms of the Apache Licence Version 2.0
 # which can be obtained at http://www.apache.org/licenses/LICENSE-2.0. 
 
-set( ${PROJECT_NAME}_VERSION_STR  "2.4.0-alpha" )
+set( ${PROJECT_NAME}_VERSION_STR  "3.1.1" )
 
diff --git a/src/Build/config-setup/gfortran-debug.setup b/src/Build/config-setup/gfortran-debug.setup
@@ -11,8 +11,9 @@ if [[ "$uname" == "Linux"  ]] ; then
 		export NC4_DIR=/usr/local/ #singularity container only
 		export HDF_DIR=/usr/local/ #singularity container only
 elif [[ "$uname" == "Darwin" ]] ; then
-		export NC4_DIR="/usr/local/Cellar/netcdf/4.8.0_2"  #mac OS, brew install
-		export HDF_DIR="/usr/local/Cellar/hdf5/1.12.1"   #mac OS, brew install
+		export NC4_DIR="/usr/local/Cellar/netcdf/4.9.2_1"  #mac OS, brew install
+		export NC4F_DIR="/usr/local/Cellar/netcdf-fortran/4.6.1"  #mac OS, brew install
+		export HDF_DIR="/usr/local/Cellar/hdf5/1.14.3_1"   #mac OS, brew install
 fi
 
 #set the number of openmp threads
@@ -38,9 +39,11 @@ export LIBS=""
 
 if [[ "$uname" == "Darwin" ]] || [[ "$uname" == "Linux" ]] ; then #mac OS, brew install or Linux (singularity)
 		export LIBS="\
-  -L $NC4_DIR/lib -lnetcdf -lnetcdff \
+  -L $NC4_DIR/lib -lnetcdf \
+  -L $NC4F_DIR/lib -lnetcdff \
   -L $HDF_DIR/lib -lhdf5 \
   -I $NC4_DIR/include \
+  -I $NC4F_DIR/include \
   -I $HDF_DIR/include "
 else
 	export LIBS=""

diff --git a/src/Build/config-setup/gfortran.setup b/src/Build/config-setup/gfortran.setup
@@ -11,8 +11,9 @@ if [[ "$uname" == "Linux"  ]] ; then
 		export NC4_DIR=/usr/local #singularity container only
 		export HDF_DIR=/usr/local #singularity container only
 elif [[ "$uname" == "Darwin" ]] ; then
-		export NC4_DIR="/usr/local/Cellar/netcdf/4.8.0_2"  #mac OS (brew install)
-		export HDF_DIR="/usr/local/Cellar/hdf5/1.12.1"   #mac OS (brew install)
+		export NC4_DIR="/usr/local/Cellar/netcdf/4.9.2_1"
+	        export NC4F_DIR="/usr/local/Cellar/netcdf-fortran/4.6.1"  #mac OS (brew install)
+		export HDF_DIR="/usr/local/Cellar/hdf5/1.14.3_1"   #mac OS (brew install)
 fi
 
 #set the number of openmp threads
@@ -38,8 +39,10 @@ export LIBS=""
 
 if [[ "$uname" == "Darwin" ]] || [[ "$uname" == "Linux" ]] ; then #mac OS, brew install or linux (singularity) 
 		export LIBS="\
-  -L $NC4_DIR/lib -lnetcdf -lnetcdff \
+  -L $NC4_DIR/lib -lnetcdf \
+  -L $NC4F_DIR/lib -lnetcdff \
   -L $HDF_DIR/lib -lhdf5 \
+  -I $NC4F_DIR/include \
   -I $NC4_DIR/include \
   -I $HDF_DIR/include "
 else