diff --git a/.gitmodules b/.gitmodules
index dc0798c32..0dbee11ea 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,8 +4,8 @@
 	branch = main
 [submodule "ccpp-physics"]
 	path = ccpp/physics
-	url = https://github.com/NCAR/ccpp-physics
-	branch = main
+	url = https://github.com/climbfuji/ccpp-physics
+	branch = feature/add_nrl_parse_tracers_ncar_main
 [submodule "CMakeModules"]
 	path = CMakeModules
 	url = https://github.com/noaa-emc/CMakeModules
diff --git a/ccpp/physics b/ccpp/physics
index f0fbb34a3..faee4edcc 160000
--- a/ccpp/physics
+++ b/ccpp/physics
@@ -1 +1 @@
-Subproject commit f0fbb34a350acac90e71de6e51351f78174eb8de
+Subproject commit faee4edcc3c3dd6965321d69530ac500769ff9a6
diff --git a/scm/src/GFDL_parse_tracers.F90 b/scm/src/GFDL_parse_tracers.F90
new file mode 100644
index 000000000..c81127101
--- /dev/null
+++ b/scm/src/GFDL_parse_tracers.F90
@@ -0,0 +1,41 @@
+module parse_tracers
+
+  integer, parameter :: NO_TRACER = -99
+
+  public get_tracer_index, NO_TRACER
+
+CONTAINS
+
+  function get_tracer_index (tracer_names, name, me, master, debug)
+
+    character(len=32), intent(in) :: tracer_names(:)
+    character(len=*),  intent(in) :: name
+    integer,           intent(in) :: me
+    integer,           intent(in) :: master
+    logical,           intent(in) :: debug
+    !--- local variables
+    integer :: get_tracer_index
+    integer :: i
+
+    get_tracer_index = NO_TRACER
+
+    do i=1, size(tracer_names)
+       if (trim(name) == trim(tracer_names(i))) then
+           get_tracer_index = i
+           exit
+       endif
+    enddo
+
+    if (debug .and. (me == master)) then
+      if (get_tracer_index == NO_TRACER) then
+        print *,' PE ',me,' tracer with name '//trim(name)//' not found'
+      else
+        print *,' PE ',me,' tracer FOUND:',trim(name)
+      endif
+    endif
+
+    return
+
+  end function get_tracer_index
+
+end module parse_tracers
diff --git a/scm/src/GFS_typedefs.meta b/scm/src/GFS_typedefs.meta
index 2e74c0e7a..1543b8e31 100644
--- a/scm/src/GFS_typedefs.meta
+++ b/scm/src/GFS_typedefs.meta
@@ -10075,7 +10075,7 @@
   dependencies = hooks/machine.F,hooks/physcons.F90
   dependencies = Radiation/RRTMG/radlw_param.f,Radiation/RRTMG/radsw_param.f
   dependencies = photochem/h2o_def.f,photochem/module_ozphys.F90
-  dependencies = MP/GFDL/GFDL_parse_tracers.F90
+  dependencies = ../../../scm/src/GFDL_parse_tracers.F90
   dependencies = Interstitials/UFS_SCM_NEPTUNE/GFS_ccpp_suite_sim_pre.F90
 
 [ccpp-arg-table]
diff --git a/test/cmp_scmout.py b/test/cmp_scmout.py
index b2a7886b1..57010fa62 100755
--- a/test/cmp_scmout.py
+++ b/test/cmp_scmout.py
@@ -41,10 +41,8 @@ def main():
     # Housekeeping
     if file_rt is not None:
         result = os.system('tar -cvf scm_out_abs.tar scm_plots/*.png')
-        result = os.system('tar -cvf /scratch1/data_untrusted/Dustin.Swales/scm_out_abs.tar scm_plots/*.png')
     else:
         result = os.system('tar -cvf scm_out_diff.tar scm_plots/*.png')
-        result = os.system('tar -cvf /scratch1/data_untrusted/Dustin.Swales/scm_out_diff.tar scm_plots/*.png')
     # end if
     result = os.system('rm -rf scm_plots/')
 #