Move MPAS-O,SI Makefile mods to Depends files

These rules for MPAS-Ocean and MPAS-SeaIce are better handled in the
Depends.* files for each compiler than in cime:CIME/Tools/Makefile.

Author: G. Dylan Dickerson

machines/Depends.gnu

@@ -14,3 +14,12 @@ mo_fluxes_broadband_kernels.o
 
 $(RRTMGP_OBJS): %.o: %.F90
 	$(FC) -c $(INCLDIR) $(INCS) $(FFLAGS) $(FREEFLAGS) -fno-openmp $<
+
+ifeq ($(COMP_NAME),mpassi)
+# mpas seaice files that can't compile with optimization using gnu
+MPASSI_NOOPT_OBJS=\
+ice_shortwave.o
+
+$(MPASSI_NOOPT_OBJS): %.o : %.F90
+	$(FC) -c $(FPPFLAGS) $(INCLDIR) $(INCS) $(FREEFLAGS) $(FFLAGS) $(FFLAGS_NOOPT) $<
+endif

machines/Depends.nvhpc

@@ -174,6 +174,12 @@ ifeq ($(DEBUG),FALSE)
 	  $(FC) -c $(INCLDIR) $(INCS) $(FFLAGS) $(FREEFLAGS) $(OPENACC_GPU_FLAGS) $<
   $(CLUBB_OBJS): %.o: %.F90
 	  $(FC) -c $(INCLDIR) $(INCS) $(FFLAGS) $(FREEFLAGS) $(OPENACC_GPU_FLAGS) $<
+
+ifeq ($(COMP_NAME),mpaso)
+  # mpas ocean files need gpuflags
+  FFLAGS +=$(GPUFLAGS)
+endif
+
 else
   $(REDUCED_ERRORCHKS_IN_DEBUG): %.o: %.F90
 	  $(FC) -c $(INCLDIR) $(INCS) $(FFLAGS) $(FREEFLAGS) -Mnobounds -Ktrap=none -Knoieee $<