Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/docker-exodus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
with:
context: docker/exodus
push: true
tags: mrbuche/exodus:latest
tags: gdsjaar/exodus:latest
- name: Delay before pull
run: sleep 234s
test-latest:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker-seacas.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
with:
context: docker/seacas
push: true
tags: mrbuche/seacas:latest
tags: gdsjaar/seacas:latest
- name: Delay before pull
run: sleep 234s
test-latest:
Expand Down
2 changes: 1 addition & 1 deletion cmake/tribits/common_tpls/FindTPLCGNS.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ set(CNGS_ALLOW_MODERN FALSE CACHE BOOL "Allow finding CGNS as a modern CMake con

if ((CGNS_ALLOW_MODERN AND HDF5_FOUND_MODERN_CONFIG_FILE) OR CGNS_FORCE_MODERN)

set(minimum_modern_CGNS_version 4.0)
set(minimum_modern_CGNS_version 3.9)
print_var(CGNS_ALLOW_MODERN)
print_var(CGNS_FORCE_MODERN)
message("-- Using find_package(CGNS ${minimum_modern_CGNS_version} CONFIG) ...")
Expand Down
6 changes: 3 additions & 3 deletions docker/exodus/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ WORKDIR /seacas/build
RUN ../cmake-exodus && \
make && \
make install
ENV PATH "${PATH}:/seacas/bin/"
ENV PYTHONPATH "${PYTHONPATH}:/seacas/lib/"
ENV LD_LIBRARY_PATH "${LD_LIBRARY_PATH}:/seacas/lib/"
ENV PATH="${PATH}:/seacas/bin/"
ENV PYTHONPATH="${PYTHONPATH:""}:/seacas/lib/"
ENV LD_LIBRARY_PATH="${LD_LIBRARY_PATH:""}:/seacas/lib/"
CMD ["/bin/bash"]
6 changes: 3 additions & 3 deletions docker/seacas/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ WORKDIR /seacas/build
RUN ../cmake-config && \
make && \
make install
ENV PATH "${PATH}:/seacas/bin/"
ENV PYTHONPATH "${PYTHONPATH}:/seacas/lib/"
ENV LD_LIBRARY_PATH "${LD_LIBRARY_PATH}:/seacas/lib/"
ENV PATH="${PATH}:/seacas/bin/"
ENV PYTHONPATH="${PYTHONPATH:""}:/seacas/lib/"
ENV LD_LIBRARY_PATH="${LD_LIBRARY_PATH:""}:/seacas/lib/"
CMD ["/bin/bash"]
7 changes: 4 additions & 3 deletions install-tpl.sh
Original file line number Diff line number Diff line change
Expand Up @@ -556,7 +556,8 @@ if [ "$FORCE" == "YES" ] || [ "$FORCE_NETCDF" == "YES" ] || ! [ -e $INSTALL_PATH
then
# netcdf_version="v4.9.1"
# netcdf_version="v4.9.2"
netcdf_version="v4.9.3"
# netcdf_version="v4.9.3"
netcdf_version="v4.10.0"
# netcdf_version="v4.8.1"
# netcdf_version="main"

Expand All @@ -570,7 +571,7 @@ then
git clone --depth 1 --branch ${netcdf_version} https://github.com/Unidata/netcdf-c netcdf-c
fi

if [ "$netcdf_version" == "v4.9.3" ]
if [ "$netcdf_version" == "v4.9.3" ] || [ "$netcdf_version" == "v4.10.0" ]
then
PREFIX="NETCDF_"
fi
Expand Down Expand Up @@ -609,7 +610,7 @@ if [ "$CGNS" == "YES" ] && [ "$HDF5" == "YES" ]
then
if [ "$FORCE" == "YES" ] || [ "$FORCE_CGNS" == "YES" ] || ! [ -e $INSTALL_PATH/lib/libcgns.${LD_EXT} ]
then
cgns_version="v4.5.0"
cgns_version="v4.5.1"
echo "${txtgrn}+++ CGNS ${cgns_version} ${txtrst}"
cd $ACCESS || exit
cd TPL/cgns || exit
Expand Down
2 changes: 1 addition & 1 deletion packages/seacas/libraries/ioss/src/Ioss_FileInfo.C
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ namespace Ioss {
return false;
}

std::string_view FileInfo::filesystem_type() const
std::string FileInfo::filesystem_type() const
{
#if !defined(__IOSS_WINDOWS__)
auto tmp_path = pathname();
Expand Down
2 changes: 1 addition & 1 deletion packages/seacas/libraries/ioss/src/Ioss_FileInfo.h
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ namespace Ioss {

IOSS_NODISCARD off_t size() const; //!< File size in bytes. Only if is_file() == true

IOSS_NODISCARD std::string_view
IOSS_NODISCARD std::string
filesystem_type() const; //!< Best guess at filesystem type (nfs, lustre, gpfs, unknown)
IOSS_NODISCARD std::string filename() const; //!< Complete filename including path
IOSS_NODISCARD std::string basename() const; //!< strip path and extension
Expand Down
Loading