Merge branch 'dev/gfdl' into code_cleanup

src/tracer/MOM_generic_tracer.F90

@@ -308,7 +308,10 @@ subroutine initialize_MOM_generic_tracer(restart, day, G, GV, h, param_file, dia
                endif
             enddo; enddo ; enddo
          endif
-
+       elseif(.not. g_tracer%requires_restart) then
+         !Do nothing for this tracer, it is initialized by the tracer package
+          call MOM_error(NOTE,"initialize_MOM_generic_tracer: "//&
+                            "skip initialization of generic tracer "//trim(g_tracer_name))
        else !Do it old way if the tracer is not registered to start from a specific source file.
             !This path should be deprecated if all generic tracers are required to start from specified sources.
         if (len_trim(CS%IC_file) > 0) then
@@ -335,7 +338,8 @@ subroutine initialize_MOM_generic_tracer(restart, day, G, GV, h, param_file, dia
           endif
         else
           call MOM_error(FATAL,"initialize_MOM_generic_tracer: "//&
-                  "check Generic Tracer IC filename "//trim(CS%IC_file)//".")
+                  "check Generic Tracer IC filename "//trim(CS%IC_file)//&
+                  " for tracer "//trim(g_tracer_name))
         endif
 
        endif