Skip to content
This repository was archived by the owner on Oct 23, 2020. It is now read-only.

Changes to Make file for the MPAS-Seaice model_forward directory #1203

Merged
akturner merged 1 commit into from
Jan 26, 2017
Merged

Changes to Make file for the MPAS-Seaice model_forward directory #1203

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Changes to Make file for the MPAS-Seaice model_forward directory 
This allows the openMP flags to be removed for a particular compiler for the model_forward directory. This satisfies issue:
E3SM-Project/MPAS#6
  • Loading branch information
@akturner
akturner committed Jan 26, 2017
commit 23de0093270e4478fdf7539b4be9fbbd024a394e
10 changes: 8 additions & 2 deletions src/core_cice/model_forward/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,18 @@ mpas_cice_core_interface.o: mpas_cice_core.o
clean:
$(RM) *.o *.i *.mod *.f90

ifneq (,$(findstring CPRIBM,$(CPPFLAGS)))
FFLAGS_noSMP := $(filter-out -qsmp%,$(FFLAGS))
else
FFLAGS_noSMP := $(FFLAGS)
endif

.F.o:
$(RM) $@ $*.mod
ifeq "$(GEN_F90)" "true"
$(CPP) $(CPPFLAGS) $(CPPINCLUDES) $< > $*.f90

$(FC) $(FFLAGS) -c $*.f90 $(FCINCLUDES) -I../../framework -I../../operators -I../../external/esmf_time_f90 -I../column -I../shared
$(FC) $(FFLAGS_noSMP) -c $*.f90 $(FCINCLUDES) -I../../framework -I../../operators -I../../external/esmf_time_f90 -I../column -I../shared
else
$(FC) $(CPPFLAGS) $(FFLAGS) -c $*.F $(CPPINCLUDES) $(FCINCLUDES) -I../../framework -I../../operators -I../../external/esmf_time_f90 -I../column -I../shared
$(FC) $(CPPFLAGS) $(FFLAGS_noSMP) -c $*.F $(CPPINCLUDES) $(FCINCLUDES) -I../../framework -I../../operators -I../../external/esmf_time_f90 -I../column -I../shared
endif