Skip to content

Commit

Permalink
Feature #2669 proj (#2672)
Browse files Browse the repository at this point in the history
  • Loading branch information
JohnHalleyGotway authored Sep 5, 2023
1 parent 1dd0917 commit 1ccc067
Show file tree
Hide file tree
Showing 195 changed files with 1,092 additions and 769 deletions.
2 changes: 1 addition & 1 deletion .github/jobs/set_job_controls.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ run_unit_tests=false
run_diff=false
run_update_truth=false
met_base_repo=met-base
met_base_tag=v2.0_debian10
met_base_tag=v2.1
input_data_version=develop
truth_data_version=develop

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_docker_and_trigger_metplus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
env:
SOURCE_BRANCH: ${{ steps.get_branch_name.outputs.branch_name }}-lite
MET_BASE_REPO: met-base
MET_BASE_TAG: v2.0_debian10
MET_BASE_TAG: v2.1

- name: Push Docker Image
run: .github/jobs/push_docker_image.sh
Expand Down
5 changes: 5 additions & 0 deletions INSTALL
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,11 @@ sub-directory, or the MET Online Tutorial:
$MET_<lib>LIB pointing to the directory with the library files. If
$MET_<lib>INC and $MET_<lib>LIB are defined, then $MET_<lib> is ignored.

- Set $MET_PROJ to point to the main Proj directory, or set
$MET_PROJINC to point to the directory with the Proj include files
and set $MET_PROJLIB to point to the directory with the Proj
library files.

- Set $MET_NETCDF to point to the main NetCDF directory, or set
$MET_NETCDFINC to point to the directory with the NetCDF include files
and set $MET_NETCDFLIB to point to the directory with the NetCDF
Expand Down
3 changes: 3 additions & 0 deletions Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -274,6 +274,9 @@ MET_HDFLIB = @MET_HDFLIB@
MET_NETCDF = @MET_NETCDF@
MET_NETCDFINC = @MET_NETCDFINC@
MET_NETCDFLIB = @MET_NETCDFLIB@
MET_PROJ = @MET_PROJ@
MET_PROJINC = @MET_PROJINC@
MET_PROJLIB = @MET_PROJLIB@
MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@
MET_PYTHON_CC = @MET_PYTHON_CC@
MET_PYTHON_LD = @MET_PYTHON_LD@
Expand Down
Loading

0 comments on commit 1ccc067

Please sign in to comment.