Merge branch 'python_dev_meeting' of github.com:negin513/CTSM into py…

…thon_dev_meeting Conflicts: python/ctsm/site_and_regional/single_point_case.py
ESCOMP · Jan 5, 2022 · 72261e3 · 72261e3
2 parents 94777dc + 416f45f
commit 72261e3
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/python/ctsm/site_and_regional/single_point_case.py b/python/ctsm/site_and_regional/single_point_case.py
@@ -275,9 +275,6 @@ def create_surfdata_at_point(self, indir, file, user_mods_dir):
         # update attributes
         self.update_metadata(f_out)
         f_out.attrs["Created_from"] = fsurf_in
-        if ( hasattr(f_out.attrs, "History_Log" ) ):
-            del f_out.attrs["History_Log"]
-
         # mode 'w' overwrites file
         wfile = os.path.join(self.output_dir, fsurf_out)
         f_out.to_netcdf(path=wfile, mode="w", format="NETCDF3_64BIT")

diff --git a/python/ctsm/subset_data.py b/python/ctsm/subset_data.py
@@ -329,6 +329,7 @@ def get_parser():
             type=str,
             default="",
         )
+        add_logging_args(subparser)
 
     # -- print help for both subparsers
     parser.epilog = textwrap.dedent(
@@ -576,7 +577,6 @@ def main():
     # add logging flags from ctsm_logging
     setup_logging_pre_config()
     parser = get_parser()
-    add_logging_args(parser)
     args = parser.parse_args()
     process_logging_args(args)