From a2d8532a87660f7df8f4e278e9733f86ba3b55e6 Mon Sep 17 00:00:00 2001
From: Spencer Clark <spencerkclark@gmail.com>
Date: Fri, 29 Sep 2023 16:00:12 +0000
Subject: [PATCH] Update SHiELD_build per Rusty's comments

---
 docker/Dockerfile       | 12 ++++++------
 submodules/SHiELD_build |  2 +-
 wrapper/Makefile        |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index dcfc915..b8db33c 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -59,18 +59,18 @@ ENV SHiELD_LD=mpif90
 ENV SUBMODULE_DIR=/SHiELD
 COPY submodules ${SUBMODULE_DIR}/
 
-# Build FMS, NCEPlibs, and SHiELD using SHiELD_build
-# FMS_CPPDEFS needed to address https://github.com/NOAA-GFDL/FMS/issues/426 and
-# to build FMS with the -fPIC flag, which is required for the wrapper.
+# Build FMS, NCEPlibs, and SHiELD using SHiELD_build with position independent
+# code FMS_CPPDEFS is needed to address
+# https://github.com/NOAA-GFDL/FMS/issues/426
 RUN cd ${SUBMODULE_DIR}/SHiELD_build/Build && \
-    FMS_CPPDEFS="-DHAVE_GETTID -fPIC" \
+    FMS_CPPDEFS="-DHAVE_GETTID" \
     FC=${SHiELD_FC} \
     CC=${SHiELD_CC} \
     CXX=${SHiELD_CXX} \
     LD=${SHiELD_LD} \
     TEMPLATE=site/gnu.mk \
     AVX_LEVEL=-march=native \
-    ./COMPILE shield_wrapper 64bit gnu
+    ./COMPILE shield 64bit gnu pic
 
 COPY requirements.txt /tmp
 RUN \
@@ -92,7 +92,7 @@ RUN make -C wrapper \
     CXX=${SHiELD_CXX} \
     LD=${SHiELD_LD} \
     LDSHARED="${SHiELD_CC} -shared" \
-    FPIC=Y \
+    PIC=Y \
     OPENMP=Y \
     AVX=Y \
     build install
diff --git a/submodules/SHiELD_build b/submodules/SHiELD_build
index 1e39900..df20ab4 160000
--- a/submodules/SHiELD_build
+++ b/submodules/SHiELD_build
@@ -1 +1 @@
-Subproject commit 1e3990006b8b4a1b0b2da7211b9cbeb593f539b9
+Subproject commit df20ab49333be9520baf447c8df79a88bbc96bbf
diff --git a/wrapper/Makefile b/wrapper/Makefile
index 8676d52..7f92fd4 100644
--- a/wrapper/Makefile
+++ b/wrapper/Makefile
@@ -8,7 +8,7 @@ CC ?= mpicc
 CXX ?= mpicxx
 LD ?= mpif90
 
-ARTIFACTS=$(SHIELD_BUILD)/Build/exec/shield_wrapper_nh.prod.64bit.gnu
+ARTIFACTS=$(SHIELD_BUILD)/Build/exec/shield_nh.prod.64bit.gnu
 FMS_64BIT=$(SHIELD_BUILD)/Build/libFMS/gnu/64bit
 FFLAGS += -I$(ARTIFACTS) -I$(FMS_64BIT)
 MPI_FLAGS=`$(FC) -show | sed 's/\(-I[^ ]*\|^[^ ]*\)//g'`