Skip to content

Commit

Permalink
Remove FRE-NCtools submodule, use GFDL version instead (#1138)
Browse files Browse the repository at this point in the history
* Remove FRE-NCtools submodule

* Use GFDL version of FRE-NCtools in post process Dockerfile
  • Loading branch information
Oliver Watt-Meyer committed Apr 7, 2021
1 parent 5e756d0 commit b1e3b5b
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 8 deletions.
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,3 @@
[submodule "external/fv3gfs-util"]
path = external/fv3gfs-util
url = [email protected]:VulcanClimateModeling/fv3gfs-util.git
[submodule "external/FRE-NCtools"]
path = external/FRE-NCtools
url = [email protected]:VulcanClimateModeling/FRE-NCtools.git
14 changes: 10 additions & 4 deletions docker/post_process_run/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,16 @@ RUN apt-get update && apt-get install -y \
python3-dev \
python3-pip

# install FRE-NCtools including fregrid
COPY external/FRE-NCtools /FRE-NCtools
RUN cd FRE-NCtools && export CFLAGS=-Wno-traditional NETCDF_LDFLAGS=-lm && \
\autoreconf -i && ./configure && make && make install
# install FRE-NCtools including fregrid. Ideally we would download a
# tarball of the latest versioned tag (v2.18.0) but v2.18.0 fails
# to build whereas this more recent commit is successful.
RUN git config --global http.sslverify false && \
git clone https://github.com/NOAA-GFDL/FRE-NCtools.git && \
cd FRE-NCtools && \
git checkout f5d700467f100b63bf5bf92d69c76be989dd2924 && \
export CFLAGS=-Wno-traditional NETCDF_LDFLAGS=-lm && \
autoreconf -i && ./configure && make && make install && \
cd .. && rm -r FRE-NCtools

# install gcloud
RUN apt-get update && apt-get install -y apt-transport-https ca-certificates gnupg curl gettext
Expand Down
1 change: 0 additions & 1 deletion external/FRE-NCtools
Submodule FRE-NCtools deleted from f160bb

0 comments on commit b1e3b5b

Please sign in to comment.