From 1a8686f8b8ec03af2fb651f87c8703a13d699b01 Mon Sep 17 00:00:00 2001 From: Benjamin Johnson <33431190+BenjaminTJohnson@users.noreply.github.com> Date: Mon, 27 Feb 2023 11:37:43 -0500 Subject: [PATCH 1/4] Update VERSION.cmake updated version string. --- VERSION.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION.cmake b/VERSION.cmake index cb581a0..8486620 100644 --- a/VERSION.cmake +++ b/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" ) +set( ${PROJECT_NAME}_VERSION_STR "3.0.0" ) From 15fd2f7bfa59f130be95fe8dde387bf68e77f2d4 Mon Sep 17 00:00:00 2001 From: Alexander Mayorov Date: Tue, 28 Feb 2023 21:05:36 -0500 Subject: [PATCH 2/4] Removed fix/ softlink. --- fix | 1 - 1 file changed, 1 deletion(-) delete mode 120000 fix diff --git a/fix b/fix deleted file mode 120000 index b88a595..0000000 --- a/fix +++ /dev/null @@ -1 +0,0 @@ -../fix_REL-2.4.1_20220708/fix \ No newline at end of file From d14cd73eff8cdd52a515ff4eed838077cb23600d Mon Sep 17 00:00:00 2001 From: Alexander Mayorov Date: Wed, 1 Mar 2023 23:10:31 -0500 Subject: [PATCH 3/4] Added fix/ download script from v2.4.1. --- Get_CRTM_Binary_Files.sh | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100755 Get_CRTM_Binary_Files.sh diff --git a/Get_CRTM_Binary_Files.sh b/Get_CRTM_Binary_Files.sh new file mode 100755 index 0000000..c772343 --- /dev/null +++ b/Get_CRTM_Binary_Files.sh @@ -0,0 +1,22 @@ +#foldername="fix_REL-2.4.0" #rel 2.4.0 files +foldername="fix_REL-2.4.1_latest" + +filename="${foldername}.tgz" +if test -f "$filename"; then + if [ -d "fix/" ]; then #fix directory exists + echo "fix/ already exists, doing nothing." + else + #untar the file and move directory to fix + tar -zxvf $filename + mv $foldername fix + echo "fix/ directory created from existing $filename file." + fi +else + #download, untar, move + echo "downloading $filename, please wait about 5 minutes (3.3 GB tar file)" + wget -q ftp://ftp.ssec.wisc.edu/pub/s4/CRTM/$filename # CRTM binary files + tar -zxvf $filename + mv $foldername fix + echo "fix/ directory created from downloaded $filename." +fi +echo "Completed." From cf2be03db950c7eb17b2c8191e81cf1af7410526 Mon Sep 17 00:00:00 2001 From: Alexander Mayorov Date: Wed, 1 Mar 2023 23:19:34 -0500 Subject: [PATCH 4/4] Cleanup: Removed unused travis CI yaml file. --- .travis.yml | 34 ---------------------------------- 1 file changed, 34 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index e0ede7e..0000000 --- a/.travis.yml +++ /dev/null @@ -1,34 +0,0 @@ -#====================================================================== -# Project settings -#====================================================================== -branches: - only: - - develop - -language: cpp - -services: - - docker - -before_install: - - echo $TRAVIS_PULL_REQUEST - - echo $TRAVIS_PULL_REQUEST_BRANCH - - echo $TRAVIS_BRANCH - - export BRANCH=$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then echo $TRAVIS_BRANCH; else echo $TRAVIS_PULL_REQUEST_BRANCH; fi) - - echo "TRAVIS_BRANCH=$TRAVIS_BRANCH, PR=$PR, BRANCH=$BRANCH" - - pwd - - ls ${TRAVIS_BUILD_DIR} - - - docker pull jcsda/docker-clang-mpich-dev - - docker images - -script: - - docker run -d -t --name clang_container -v ${TRAVIS_BUILD_DIR}:/jcsda/src_repo jcsda/docker-clang-mpich-dev - - docker exec clang_container bash -c 'ls /jcsda/src_repo' - - docker exec clang_container bash -c 'mkdir /build_container' - - docker exec clang_container bash -c 'cd /build_container && ecbuild /jcsda/src_repo' - - docker exec clang_container bash -c 'cd /build_container && make -j4' -# Not running the ctests right now since the AerosolCoeff.bin files are not recognized: -# Check_Binary_File(FAILURE) : Error opening ./testinput/AerosolCoeff.bin - Cannot open file './testinput/AerosolCoeff.bin': No such file or directory -# - docker exec clang_container bash -c 'cd /jcsda/src_repo && . ./Set_CRTM_Environment.sh && sh Uncompress_Binary_Files.sh && cd /build_container && ctest --output-on-failure' -