Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/cd air craft star #179

Merged
merged 7 commits into from
Nov 25, 2024
Merged

Feature/cd air craft star #179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8a9e36f
Aircraft updates based on branch CloudRadar_AirCraft by Mark Liu
chengdang Aug 8, 2024
f390236
Merge branch 'develop' into feature/cd_AirCraft_STAR
chengdang Aug 11, 2024
d79de6f
Update for standalone CRTM configuration
chengdang Aug 12, 2024
feff9fb
Merge branch 'feature/cd_standalone_config' into feature/cd_AirCraft_…
chengdang Aug 12, 2024
475fb0a
Update aircraft test, add Downwelling_Radiance test
chengdang Aug 15, 2024
617b7c1
Merge branch 'develop' into feature/cd_AirCraft_STAR
chengdang Sep 4, 2024
13c5853
Merge branch 'develop' into feature/cd_AirCraft_STAR
chengdang Nov 25, 2024
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 src/Build/VERSION.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-alpha" )
set( ${PROJECT_NAME}_VERSION_STR "3.1.1" )

9 changes: 6 additions & 3 deletions src/Build/config-setup/gfortran-debug.setup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,9 @@ if [[ "$uname" == "Linux" ]] ; then
export NC4_DIR=/usr/local/ #singularity container only
export HDF_DIR=/usr/local/ #singularity container only
elif [[ "$uname" == "Darwin" ]] ; then
export NC4_DIR="/usr/local/Cellar/netcdf/4.8.0_2" #mac OS, brew install
export HDF_DIR="/usr/local/Cellar/hdf5/1.12.1" #mac OS, brew install
export NC4_DIR="/usr/local/Cellar/netcdf/4.9.2_1" #mac OS, brew install
export NC4F_DIR="/usr/local/Cellar/netcdf-fortran/4.6.1" #mac OS, brew install
export HDF_DIR="/usr/local/Cellar/hdf5/1.14.3_1" #mac OS, brew install
fi

#set the number of openmp threads
Expand All @@ -38,9 +39,11 @@ export LIBS=""

if [[ "$uname" == "Darwin" ]] || [[ "$uname" == "Linux" ]] ; then #mac OS, brew install or Linux (singularity)
export LIBS="\
-L $NC4_DIR/lib -lnetcdf -lnetcdff \
-L $NC4_DIR/lib -lnetcdf \
-L $NC4F_DIR/lib -lnetcdff \
-L $HDF_DIR/lib -lhdf5 \
-I $NC4_DIR/include \
-I $NC4F_DIR/include \
-I $HDF_DIR/include "
else
export LIBS=""
Expand Down
9 changes: 6 additions & 3 deletions src/Build/config-setup/gfortran.setup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,9 @@ if [[ "$uname" == "Linux" ]] ; then
export NC4_DIR=/usr/local #singularity container only
export HDF_DIR=/usr/local #singularity container only
elif [[ "$uname" == "Darwin" ]] ; then
export NC4_DIR="/usr/local/Cellar/netcdf/4.8.0_2" #mac OS (brew install)
export HDF_DIR="/usr/local/Cellar/hdf5/1.12.1" #mac OS (brew install)
export NC4_DIR="/usr/local/Cellar/netcdf/4.9.2_1"
export NC4F_DIR="/usr/local/Cellar/netcdf-fortran/4.6.1" #mac OS (brew install)
export HDF_DIR="/usr/local/Cellar/hdf5/1.14.3_1" #mac OS (brew install)
fi

#set the number of openmp threads
Expand All @@ -38,8 +39,10 @@ export LIBS=""

if [[ "$uname" == "Darwin" ]] || [[ "$uname" == "Linux" ]] ; then #mac OS, brew install or linux (singularity)
export LIBS="\
-L $NC4_DIR/lib -lnetcdf -lnetcdff \
-L $NC4_DIR/lib -lnetcdf \
-L $NC4F_DIR/lib -lnetcdff \
-L $HDF_DIR/lib -lhdf5 \
-I $NC4F_DIR/include \
-I $NC4_DIR/include \
-I $HDF_DIR/include "
else
Expand Down
Loading