From 60be83bd66915bf046c2e6d8f97edc6713f850cc Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Wed, 27 Mar 2024 11:02:47 -0600 Subject: [PATCH 1/2] fixes an issue with symbols in compset names on derecho --- cime_config/buildexe | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/cime_config/buildexe b/cime_config/buildexe index 1d7366718..5c9fed5ac 100755 --- a/cime_config/buildexe +++ b/cime_config/buildexe @@ -99,7 +99,7 @@ def _main_func(): # build model executable makefile = os.path.join(casetools, "Makefile") exename = os.path.join(exeroot, cime_model + ".exe") - + # always rebuild file esm.F90 this is because cpp macros in that file may have changed esm = os.path.join(bld_root,"esm.o") if os.path.isfile(esm): @@ -108,12 +108,15 @@ def _main_func(): # always relink if os.path.isfile(exename): os.remove(exename) - + exename = os.path.relpath(exename, bld_root) cmd = "{} exec_se -j {} EXEC_SE={} COMP_NAME=driver {} -f {} "\ .format(gmake, gmake_j, exename, gmake_args, makefile) + pio = os.environ.get("PIO") + if pio: + os.environ["PIO_LIBDIR"] = os.path.join(pio,"lib") + - - rc, out, err = run_cmd(cmd,from_dir=bld_root) + rc, out, err = run_cmd(cmd,from_dir=bld_root,verbose=True) expect(rc==0,"Command {} failed rc={}\nout={}\nerr={}".format(cmd,rc,out,err)) if err: logger.info(err) From a641b0ad91761d98574199e602cce1d24eb185d5 Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Wed, 27 Mar 2024 11:08:05 -0600 Subject: [PATCH 2/2] clean up --- cime_config/buildexe | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/cime_config/buildexe b/cime_config/buildexe index 5c9fed5ac..4923f016d 100755 --- a/cime_config/buildexe +++ b/cime_config/buildexe @@ -99,7 +99,7 @@ def _main_func(): # build model executable makefile = os.path.join(casetools, "Makefile") exename = os.path.join(exeroot, cime_model + ".exe") - + # always rebuild file esm.F90 this is because cpp macros in that file may have changed esm = os.path.join(bld_root,"esm.o") if os.path.isfile(esm): @@ -114,9 +114,8 @@ def _main_func(): pio = os.environ.get("PIO") if pio: os.environ["PIO_LIBDIR"] = os.path.join(pio,"lib") - - rc, out, err = run_cmd(cmd,from_dir=bld_root,verbose=True) + rc, out, err = run_cmd(cmd,from_dir=bld_root) expect(rc==0,"Command {} failed rc={}\nout={}\nerr={}".format(cmd,rc,out,err)) if err: logger.info(err)