Merge pull request #175 from gaelforget/v0p5p15b

V0p5p15b

Author: gaelforget

Project.toml

@@ -1,7 +1,7 @@
 name = "MITgcm"
 uuid = "dce5fa8e-68ce-4431-a242-9469c69627a0"
 authors = ["gaelforget <gforget@mit.edu>"]
-version = "0.5.14"
+version = "0.5.15"
 
 [deps]
 ClimateModels = "f6adb021-9183-4f40-84dc-8cea6f651bb0"

lib/build_mitgcm_lib.sh

@@ -132,8 +132,24 @@ if ! grep -q '_BYTESWAPIO' "$BUILD_DIR/Makefile" 2>/dev/null; then
     make depend 2>&1 | tail -3
 fi
 
-echo "  Compiling MITgcm..."
-make -j$(sysctl -n hw.ncpu 2>/dev/null || nproc 2>/dev/null || echo 4) 2>&1 | tail -5
+# For shared library mode, compile everything with -fPIC
+echo "  Compiling MITgcm with -fPIC for shared library..."
+
+# Clean previous builds to force recompilation with new flags
+make clean 2>&1 | tail -2
+make depend 2>&1 | tail -3
+
+# Build with -fPIC appended to all compiler flags
+# Extract existing flags first
+EXISTING_FFLAGS=$(grep '^FFLAGS = ' "$BUILD_DIR/Makefile" | sed 's/^FFLAGS = //' | head -1)
+EXISTING_FOPTIM=$(grep '^FOPTIM = ' "$BUILD_DIR/Makefile" | sed 's/^FOPTIM = //' | head -1)
+EXISTING_CFLAGS=$(grep '^CFLAGS = ' "$BUILD_DIR/Makefile" | sed 's/^CFLAGS = //' | head -1)
+
+make -j$(sysctl -n hw.ncpu 2>/dev/null || nproc 2>/dev/null || echo 4) \
+    FFLAGS="${EXISTING_FFLAGS} -fPIC" \
+    FOPTIM="${EXISTING_FOPTIM} -fPIC" \
+    CFLAGS="${EXISTING_CFLAGS} -fPIC" \
+    2>&1 | tail -5
 
 echo "  MITgcm build complete."
 echo ""
@@ -216,6 +232,15 @@ else
     done
 fi
 
+echo ">> $FC"
+echo ">> $SHLIB_FLAGS"
+echo ">> $OUTPUT_DIR"
+echo ">> $OBJ_FILES"
+echo ">> $SHLIB_NAME"
+echo ">> $LIBS"
+
+#echo "$FC $SHLIB_FLAGS -o $OUTPUT_DIR/$SHLIB_NAME $OBJ_FILES $LIBS"
+
 $FC $SHLIB_FLAGS -o "$OUTPUT_DIR/$SHLIB_NAME" $OBJ_FILES $LIBS
 
 echo "  Created: $OUTPUT_DIR/$SHLIB_NAME"

src/MITgcmBuild.jl

@@ -1,4 +1,5 @@
 using Scratch
+using MITgcm.ClimateModels.Suppressor
 
 const MITGCM_GIT_URL = "https://github.com/MITgcm/MITgcm.git"
 const MITGCM_DEFAULT_CHECKOUT = "checkpoint69j"
@@ -63,7 +64,8 @@ Returns a NamedTuple `(library_path, run_dir)`.
 function build_mitgcm_library(mitgcm_dir::String;
                               output_dir::String = mktempdir(),
                               code_dir::String   = default_code_dir(mitgcm_dir),
-                              input_dir::String  = default_input_dir(mitgcm_dir))
+                              input_dir::String  = default_input_dir(mitgcm_dir),
+                              verbose=false)
 
     mitgcm_dir = abspath(mitgcm_dir)
     output_dir = abspath(output_dir)
@@ -94,7 +96,11 @@ function build_mitgcm_library(mitgcm_dir::String;
 
     cmd = `bash $build_script $mitgcm_dir $output_dir $code_dir $input_dir $wrapper_src`
     @info "Building MITgcm shared library..." output_dir code_dir input_dir
-    run(cmd)
+    if verbose
+        run(cmd)
+    else
+        @suppress run(cmd)
+    end
 
     lib_name = Sys.isapple() ? "libmitgcm.dylib" : "libmitgcm.so"
     library_path = joinpath(output_dir, lib_name)

test/test_mitgcm_library.jl

@@ -23,7 +23,7 @@ else
 
     @testset "build_mitgcm_library" begin
         result = MITgcm.build_mitgcm_library(mitgcm_dir;
-                                              output_dir, code_dir, input_dir)
+                                              output_dir, code_dir, input_dir, verbose=false)
         @test isfile(result.library_path)
         @test isdir(result.run_dir)
     end
@@ -206,8 +206,8 @@ else
         @test any(ocean.salt  .!= 0)
 
         # Physical constants
-        @test ocean.ρ₀ > 0
-        @test ocean.cₚ > 0
+        @test ocean.reference_density > 0
+        @test ocean.heat_capacity > 0
 
         # eltype
         @test eltype(ocean) == Float64