Skip to content

Commit

Permalink
Merge pull request #1223 from jvgeiger/fix/gnu-fallow-argument-mismatch
Browse files Browse the repository at this point in the history
Address errors raised by GNU compilers
  • Loading branch information
cmclaug2 authored Oct 28, 2022
2 parents e1a4cb3 + 5afcf0a commit 9d48ee3
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 0 deletions.
11 changes: 11 additions & 0 deletions ldt/make/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,17 @@ version.F90:
@echo "Building version file $@"
sh build_version.sh

ifeq ($(LIS_ARCH),linux_gfortran)
# For MPI
LDT_historyMod.o: LDT_historyMod.F90
$(FC) $(FFLAGS) -fallow-argument-mismatch $(HEADER_DIRS) $<
# For HDF-EOS2
readGLASSlaiObs.o: readGLASSlaiObs.F90
$(FC) $(FFLAGS) -fallow-argument-mismatch $(HEADER_DIRS) $<
readNASA_AMSREsmObs.o: readNASA_AMSREsmObs.F90
$(FC) $(FFLAGS) -fallow-argument-mismatch $(HEADER_DIRS) $<
endif

.PHONY: help
help:
@echo ""
Expand Down
21 changes: 21 additions & 0 deletions lis/make/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,27 @@ soil_htc_jls_mod.o: soil_htc_jls_mod.F90
$(FC) $(FFLAGS) -O0 $(HEADER_DIRS) $<
endif

ifeq ($(LIS_ARCH),linux_gfortran)
# For MPI
LIS_historyMod.o: LIS_historyMod.F90
$(FC) $(FFLAGS) -fallow-argument-mismatch $(HEADER_DIRS) $<
LIS_DAobservationsMod.o: LIS_DAobservationsMod.F90
$(FC) $(FFLAGS) -fallow-argument-mismatch $(HEADER_DIRS) $<
USAF_bratsethMod.o: USAF_bratsethMod.F90
$(FC) $(FFLAGS) -fallow-argument-mismatch $(HEADER_DIRS) $<
gmaopert_Mod.o: gmaopert_Mod.F90
$(FC) $(FFLAGS) -fallow-argument-mismatch $(HEADER_DIRS) $<
HYMAP2_routingMod.o: HYMAP2_routingMod.F90
$(FC) $(FFLAGS) -fallow-argument-mismatch $(HEADER_DIRS) $<
read_SMOSNRTNNL2sm.o: read_SMOSNRTNNL2sm.F90
$(FC) $(FFLAGS) -fallow-argument-mismatch $(HEADER_DIRS) $<
HYMAP2_model.o: HYMAP2_model.F90
$(FC) $(FFLAGS) -fallow-argument-mismatch $(HEADER_DIRS) $<
# For HDF-EOS2
read_GLASSlai.o: read_GLASSlai.F90
$(FC) $(FFLAGS) -fallow-argument-mismatch $(HEADER_DIRS) $<
endif

.PHONY: help
help:
@echo ""
Expand Down
8 changes: 8 additions & 0 deletions lvt/make/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,14 @@ version.F90:
@echo "Building version file $@"
sh build_version.sh

ifeq ($(LIS_ARCH),linux_gfortran)
# For HDF-EOS2
readGLASSlaiObs.o: readGLASSlaiObs.F90
$(FC) $(FFLAGS) -fallow-argument-mismatch $(HEADER_DIRS) $<
readNASA_AMSREsmObs.o: readNASA_AMSREsmObs.F90
$(FC) $(FFLAGS) -fallow-argument-mismatch $(HEADER_DIRS) $<
endif

.PHONY: help
help:
@echo ""
Expand Down

0 comments on commit 9d48ee3

Please sign in to comment.