Clean up non-ncar make files and build_examples

Author: manishvenu

standalone/build/build_examples.sh

@@ -18,7 +18,7 @@ FMS_ROOT=${CESM_ROOT}/libraries/FMS
 # Default compiler
 COMPILER="intel"
 MACHINE="ncar"
-DEBUG=0 # Set to False, or REPRO Mode!
+DEBUG=0 # Set to False (REPRO Mode)!
 
 # Parse command line arguments
 while [[ "$#" -gt 0 ]]; do

standalone/templates/homebrew-gnu.mk

@@ -12,68 +12,36 @@ LD = mpif90 $(MAIN_PROGRAM)
 # flags #
 #########
 DEBUG =
-REPRO =
-VERBOSE =
-OPENMP =
 
 MAKEFLAGS += --jobs=2
 
 FPPFLAGS :=
 
 FFLAGS := -fcray-pointer -fdefault-double-8 -fdefault-real-8 -Waliasing -ffree-line-length-none -fno-range-check
-FFLAGS += -I$(shell nf-config --includedir)
-FFLAGS_OPT = -O3
 FFLAGS_REPRO = -O2 -fbounds-check
 FFLAGS_DEBUG = -O0 -g -W -fbounds-check -fbacktrace -ffpe-trap=invalid,zero,overflow
-FFLAGS_OPENMP = -fopenmp
-FFLAGS_VERBOSE =
 
 CFLAGS := -D__IFC
-CFLAGS += -I$(shell nc-config --includedir)
-CFLAGS_OPT = -O2
-CFLAGS_OPENMP = -fopenmp
+CFLAGS_REPRO= -O2
 CFLAGS_DEBUG = -O0 -g
 
-# Optional Testing compile flags.  Mutually exclusive from DEBUG, REPRO, and OPT
-# *_TEST will match the production if no new option(s) is(are) to be tested.
-FFLAGS_TEST = -O2
-CFLAGS_TEST = -O2
-
 LDFLAGS :=
-LDFLAGS_OPENMP := -fopenmp
-LDFLAGS_VERBOSE :=
 
-ifneq ($(REPRO),)
-CFLAGS += $(CFLAGS_REPRO)
-FFLAGS += $(FFLAGS_REPRO)
-else ifneq ($(DEBUG),)
+ifeq ($(DEBUG),1)
 CFLAGS += $(CFLAGS_DEBUG)
 FFLAGS += $(FFLAGS_DEBUG)
-else ifneq ($(TEST),)
-CFLAGS += $(CFLAGS_TEST)
-FFLAGS += $(FFLAGS_TEST)
 else
-CFLAGS += $(CFLAGS_OPT)
-FFLAGS += $(FFLAGS_OPT)
-endif
-
-ifneq ($(OPENMP),)
-CFLAGS += $(CFLAGS_OPENMP)
-FFLAGS += $(FFLAGS_OPENMP)
-LDFLAGS += $(LDFLAGS_OPENMP)
+CFLAGS += $(CFLAGS_REPRO)
+FFLAGS += $(FFLAGS_REPRO)
 endif
 
-ifneq ($(VERBOSE),)
-CFLAGS += $(CFLAGS_VERBOSE)
-FFLAGS += $(FFLAGS_VERBOSE)
-LDFLAGS += $(LDFLAGS_VERBOSE)
-endif
+# NetCDF Things 
+FFLAGS += -I$(shell nf-config --includedir)
+CFLAGS += -I$(shell nc-config --includedir)
 
-ifeq ($(NETCDF),3)
-  # add the use_LARGEFILE cppdef
-  ifneq ($(findstring -Duse_netCDF,$(CPPDEFS)),)
-    CPPDEFS += -Duse_LARGEFILE
-  endif
+# add the use_LARGEFILE cppdef
+ifneq ($(findstring -Duse_netCDF,$(CPPDEFS)),)
+  CPPDEFS += -Duse_LARGEFILE
 endif
 
 LIBS := $(shell nc-config --libs) $(shell nf-config --flibs)

standalone/templates/ubuntu-gnu.mk

@@ -12,16 +12,13 @@ LD = mpif90 $(MAIN_PROGRAM)
 # flags #
 #########
 DEBUG =
-REPRO =
 
 
 MAKEFLAGS += --jobs=2
 
 FPPFLAGS :=
 
 FFLAGS := -fcray-pointer -fdefault-double-8 -fdefault-real-8 -Waliasing -ffree-line-length-none -fno-range-check
-FFLAGS += -I$(shell nf-config --includedir)
-FFLAGS_OPT = -O3
 FFLAGS_REPRO = -O2 -fbounds-check
 FFLAGS_DEBUG = -O0 -g -W -fbounds-check -fbacktrace -ffpe-trap=invalid,zero,overflow
 
@@ -31,21 +28,20 @@ CFLAGS_REPRO= -O2
 CFLAGS_DEBUG = -O0 -g
 
 LDFLAGS :=
-LDFLAGS_OPENMP := -fopenmp
-LDFLAGS_VERBOSE :=
 
-ifneq ($(DEBUG),)
+ifeq ($(DEBUG),1)
 CFLAGS += $(CFLAGS_DEBUG)
 FFLAGS += $(FFLAGS_DEBUG)
 else
 CFLAGS += $(CFLAGS_REPRO)
 FFLAGS += $(FFLAGS_REPRO)
 endif
 
+# NetCDF Things 
 FFLAGS += -I$(shell nf-config --includedir)
 CFLAGS += -I$(shell nc-config --includedir)
 
-  # add the use_LARGEFILE cppdef
+# add the use_LARGEFILE cppdef
 ifneq ($(findstring -Duse_netCDF,$(CPPDEFS)),)
   CPPDEFS += -Duse_LARGEFILE
 endif