Merge pull request #74 from ESMCI/master_merge

Master merge 
Merge lastest cime master into nuopc-cmeps branch
We will need new baselines.

Test suite: ./create_test --xml-testlist ../src/drivers/nuopc/cime_config/testdefs/testlist_drv.xml --xml-machine cheyenne --xml-category nuopc --walltime 00:30:00 --compare feb4 --baseline-root /glade/scratch/dunlap/BASELINES
Test baseline:
Test namelist changes:
Test status: roundoff
Fixes

User interface changes?:

Update gh-pages html (Y/N)?:

Code review:

components used:
cam svn rev 90642
cice e78444
clm ae02ffe
mom_interface a1c73e
MOM dc54281
mosart bf53c0

New baselines in /glade/scratch/jedwards/BASELINES feb25

share/timing/Makefile

@@ -58,9 +58,11 @@ endif
 OBJS = gptl.o GPTLutil.o GPTLget_memusage.o GPTLprint_memusage.o \
        gptl_papi.o f_wrappers.o perf_mod.o perf_utils.o
 
+AR ?= ar
+ARFLAGS ?= ruv
 
 libgptl.a: $(OBJS)
-	$(AR) ruv $@ $(OBJS)
+	$(AR) $(ARFLAGS) $@ $(OBJS)