better fix for nck test issues

E3SM-Project · Jul 17, 2016 · e681111 · e681111
1 parent 1abee3e
commit e681111
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 20 deletions.
diff --git a/cime_config/cesm/allactive/testmods_dirs/allactive/cism/apply_to_multiinstance/README b/cime_config/cesm/allactive/testmods_dirs/allactive/cism/apply_to_multiinstance/README
diff --git a/...nfig/cesm/allactive/testmods_dirs/allactive/cism/apply_to_multiinstance/include_user_mods b/...nfig/cesm/allactive/testmods_dirs/allactive/cism/apply_to_multiinstance/include_user_mods
diff --git a/..._config/cesm/allactive/testmods_dirs/allactive/cism/apply_to_multiinstance/shell_commands b/..._config/cesm/allactive/testmods_dirs/allactive/cism/apply_to_multiinstance/shell_commands
diff --git a/cime_config/cesm/allactive/testmods_dirs/allactive/cism/test_coupling/include_user_mods b/cime_config/cesm/allactive/testmods_dirs/allactive/cism/test_coupling/include_user_mods
@@ -1 +1 @@
-../apply_to_multiinstance
+../../default_io
diff --git a/utils/python/CIME/SystemTests/nck.py b/utils/python/CIME/SystemTests/nck.py
@@ -45,7 +45,7 @@ def build(self, sharedlib_only=False, model_only=False):
                         self._case.set_value("NTASKS_%s"%comp, ntasks/2)
                         self._case.set_value("ROOTPE_%s"%comp, rootpe/2)
                     else:
-                        self._case.set_value("NINST_%s"%comp, 1)
+                        self._case.set_value("NTASKS_%s"%comp, 2)
             self._case.flush()
 
             case_setup(self._case, test_mode=True, reset=True)
@@ -108,6 +108,8 @@ def run(self):
                         "%s/%s.exe" % (exeroot, cime_model))
             shutil.copy("LockedFiles/env_build.NCK2.xml", "env_build.xml")
             shutil.copy("env_build.xml", "LockedFiles/env_build.xml")
+            shutil.copy("LockedFiles/env_mach_pes.NCK2.xml", "env_mach_pes.xml")
+            shutil.copy("env_mach_pes.xml", "LockedFiles/env_mach_pes.xml")
 
             logger.info("default: doing a %s %s with NINST2" % (stop_n, stop_option))
             success = SystemTestsCommon._run(self, "multiinst")

diff --git a/utils/python/CIME/user_mod_support.py b/utils/python/CIME/user_mod_support.py
@@ -10,7 +10,7 @@
 
 def apply_user_mods(caseroot, user_mods_path, ninst=None):
     '''
-    Recursivlely apply user_mods to caseroot - this includes updating user_nl_xxx, 
+    Recursivlely apply user_mods to caseroot - this includes updating user_nl_xxx,
     updating SourceMods and creating case_shel_commands and xmlchange_cmds files
     '''
     include_dirs = build_include_dirs_list(user_mods_path)
@@ -23,7 +23,7 @@ def apply_user_mods(caseroot, user_mods_path, ninst=None):
             case_user_nl = user_nl.replace(include_dir, caseroot)
             comp = case_user_nl.split('_')[-1]
             if ninst is not None and comp in ninst.keys():
-                for comp_inst in xrange(1, ninst[comp]):
+                for comp_inst in xrange(1, ninst[comp]+1):
                     case_user_nl_inst = case_user_nl + "_%4.4d"%comp_inst
                     logger.info("Pre-pending file %s"%case_user_nl_inst)
                     if os.path.isfile(case_user_nl):
@@ -70,7 +70,7 @@ def apply_user_mods(caseroot, user_mods_path, ninst=None):
             with open(case_shell_commands, "a") as fd:
                 fd.write(new_shell_commands)
 
-    shell_command_files = [os.path.join(caseroot,"shell_commands"), 
+    shell_command_files = [os.path.join(caseroot,"shell_commands"),
                            os.path.join(caseroot,"xmlchange_cmnds")]
     for shell_command_file in shell_command_files:
         if os.path.isfile(shell_command_file):