Merge pull request ESCOMP#165 from jedwards4b/fix_cime_path

Corrects CIME path in buildnml scripts.
samsrabin · May 20, 2022 · 3aae649 · 3aae649
2 parents 7eab3f5 + 5bce773
commit 3aae649
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/cime_config/buildlib b/cime_config/buildlib
@@ -9,7 +9,7 @@ import sys, os, time
 _CIMEROOT = os.environ.get("CIMEROOT")
 if _CIMEROOT is None:
     raise SystemExit("ERROR: must set CIMEROOT environment variable")
-sys.path.append(os.path.join(_CIMEROOT, "scripts", "Tools"))
+sys.path.append(os.path.join(_CIMEROOT, "CIME", "Tools"))
 
 _LIBDIR = os.path.join(_CIMEROOT, "scripts", "lib")
 sys.path.append(_LIBDIR)

diff --git a/cime_config/buildlib_comps b/cime_config/buildlib_comps
@@ -9,7 +9,7 @@ import sys, os
 _CIMEROOT = os.environ.get("CIMEROOT")
 if _CIMEROOT is None:
     raise SystemExit("ERROR: must set CIMEROOT environment variable")
-sys.path.append(os.path.join(_CIMEROOT, "scripts", "Tools"))
+sys.path.append(os.path.join(_CIMEROOT, "CIME", "Tools"))
 
 _LIBDIR = os.path.join(_CIMEROOT, "scripts", "lib")
 sys.path.append(_LIBDIR)

diff --git a/datm/cime_config/buildnml b/datm/cime_config/buildnml
@@ -15,7 +15,7 @@ _CDEPS_CONFIG = os.path.join(os.path.dirname(os.path.abspath(__file__)), os.pard
 _CIMEROOT = os.environ.get("CIMEROOT")
 if _CIMEROOT is None:
     raise SystemExit("ERROR: must set CIMEROOT environment variable")
-_LIBDIR = os.path.join(_CIMEROOT, "scripts", "Tools")
+_LIBDIR = os.path.join(_CIMEROOT, "CIME", "Tools")
 sys.path.append(_LIBDIR)
 sys.path.append(_CDEPS_CONFIG)
 

diff --git a/dice/cime_config/buildnml b/dice/cime_config/buildnml
@@ -15,7 +15,7 @@ _CDEPS_CONFIG = os.path.join(os.path.dirname(os.path.abspath(__file__)), os.pard
 _CIMEROOT = os.environ.get("CIMEROOT")
 if _CIMEROOT is None:
     raise SystemExit("ERROR: must set CIMEROOT environment variable")
-_LIBDIR = os.path.join(_CIMEROOT, "scripts", "Tools")
+_LIBDIR = os.path.join(_CIMEROOT, "CIME", "Tools")
 sys.path.append(_LIBDIR)
 sys.path.append(_CDEPS_CONFIG)
 

diff --git a/dlnd/cime_config/buildnml b/dlnd/cime_config/buildnml
@@ -15,7 +15,7 @@ _CDEPS_CONFIG = os.path.join(os.path.dirname(os.path.abspath(__file__)), os.pard
 _CIMEROOT = os.environ.get("CIMEROOT")
 if _CIMEROOT is None:
     raise SystemExit("ERROR: must set CIMEROOT environment variable")
-_LIBDIR = os.path.join(_CIMEROOT, "scripts", "Tools")
+_LIBDIR = os.path.join(_CIMEROOT, "CIME", "Tools")
 sys.path.append(_LIBDIR)
 sys.path.append(_CDEPS_CONFIG)
 

diff --git a/docn/cime_config/buildnml b/docn/cime_config/buildnml
@@ -15,7 +15,7 @@ _CDEPS_CONFIG = os.path.join(os.path.dirname(os.path.abspath(__file__)), os.pard
 _CIMEROOT = os.environ.get("CIMEROOT")
 if _CIMEROOT is None:
     raise SystemExit("ERROR: must set CIMEROOT environment variable")
-_LIBDIR = os.path.join(_CIMEROOT, "scripts", "Tools")
+_LIBDIR = os.path.join(_CIMEROOT, "CIME", "Tools")
 sys.path.append(_LIBDIR)
 sys.path.append(_CDEPS_CONFIG)
 

diff --git a/drof/cime_config/buildnml b/drof/cime_config/buildnml
@@ -15,7 +15,7 @@ _CDEPS_CONFIG = os.path.join(os.path.dirname(os.path.abspath(__file__)), os.pard
 _CIMEROOT = os.environ.get("CIMEROOT")
 if _CIMEROOT is None:
     raise SystemExit("ERROR: must set CIMEROOT environment variable")
-_LIBDIR = os.path.join(_CIMEROOT, "scripts", "Tools")
+_LIBDIR = os.path.join(_CIMEROOT, "CIME", "Tools")
 sys.path.append(_LIBDIR)
 sys.path.append(_CDEPS_CONFIG)
 

diff --git a/dwav/cime_config/buildnml b/dwav/cime_config/buildnml
@@ -14,7 +14,7 @@ _CDEPS_CONFIG = os.path.join(os.path.dirname(os.path.abspath(__file__)), os.pard
 _CIMEROOT = os.environ.get("CIMEROOT")
 if _CIMEROOT is None:
     raise SystemExit("ERROR: must set CIMEROOT environment variable")
-_LIBDIR = os.path.join(_CIMEROOT, "scripts", "Tools")
+_LIBDIR = os.path.join(_CIMEROOT, "CIME", "Tools")
 sys.path.append(_LIBDIR)
 sys.path.append(_CDEPS_CONFIG)