Revert "Fix issue with saltwater in remap_lake_landice_salt"

This reverts commit 3a6ca4e.

Author: mathomp4

CHANGELOG.md

@@ -17,12 +17,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Deprecated
 
-## [2.1.9] - 2025-06-13
-
-### Fixed
-
-- Fixed issue with saltwater splitting
-
 ## [2.1.8] - 2025-05-15
 
 ### Changed

pre/remap_restart/remap_lake_landice_saltwater.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 #
 # remap_restarts package:
-#   remap_lake_landice_saltwater.py remaps lake, landice, and (data) ocean restarts
+#   remap_lake_landice_saltwater.py remaps lake, landice, and (data) ocean restarts 
 #   using config inputs from `remap_params.yaml`
 #
 # to run, must first load modules (incl. python3) as follows:
@@ -40,7 +40,7 @@ def remap(self):
      print("\nRemapping land, landice, saltwater.....\n")
      config = self.config
      cwdir  = os.getcwd()
-     bindir  = os.path.dirname(os.path.realpath(__file__))
+     bindir  = os.path.dirname(os.path.realpath(__file__)) 
 
      in_bc_base    = config['input']['shared']['bc_base']
      in_bc_version = config['input']['shared']['bc_version']
@@ -72,7 +72,7 @@ def remap(self):
         types = '.nc4'
      yyyymmddhh_ = str(config['input']['shared']['yyyymmddhh'])
 
-     label = get_label(config)
+     label = get_label(config) 
      suffix = yyyymmddhh_[0:8]+'_'+yyyymmddhh_[8:10] +'z' + types + label
 
      out_dir    = config['output']['shared']['out_dir']
@@ -142,13 +142,11 @@ def remap(self):
      if (saltwater_internal):
        cmd = exe + out_til + ' ' + in_til + ' InData/'+ saltwater_internal + ' 0 ' + str(zoom)
        self.run_and_log(cmd, log_name)
-
-       # split Saltwater Internal
-       # NOTE: split_saltwater==True means that the input restarts are already split.
-       #       So we do not split them again.
-       if not config['output']['surface']['split_saltwater']:
-         print("\nSplitting Saltwater Internal...\n")
-         cmd = bindir+'/SaltIntSplitter.x ' + out_til + ' ' + 'OutData/' + saltwater_internal
+  
+       # split Saltwater
+       if  config['output']['surface']['split_saltwater']:
+         print("\nSplitting Saltwater...\n")
+         cmd = bindir+'/SaltIntSplitter.x ' + out_til + ' ' + 'OutData/' + saltwater
 #         subprocess.call(shlex.split(cmd))
          openwater = ''
          seaice  = ''
@@ -158,17 +156,6 @@ def remap(self):
        cmd = exe + out_til + ' ' + in_til + ' InData/'+ saltwater_import + ' 0 ' + str(zoom)
        self.run_and_log(cmd, log_name)
 
-       # split Saltwater Import
-       # NOTE: split_saltwater==True means that the input restarts are already split.
-       #       So we do not split them again.
-       if not config['output']['surface']['split_saltwater']:
-         print("\nSplitting Saltwater Import...\n")
-         cmd = bindir+'/SaltIntSplitter.x ' + out_til + ' ' + 'OutData/' + saltwater_import
-#         subprocess.call(shlex.split(cmd))
-         openwater = ''
-         seaice  = ''
-         self.run_and_log(cmd, log_name)
-
      if (openwater):
        cmd = exe + out_til + ' ' + in_til + ' InData/' + openwater + ' 0 ' + str(zoom)
        self.run_and_log(cmd, log_name)