From 75a7dde617036a363e486f94f928a3200f54a961 Mon Sep 17 00:00:00 2001 From: Dana Singh <115384427+singhd789@users.noreply.github.com> Date: Wed, 11 Dec 2024 11:38:47 -0500 Subject: [PATCH 1/4] Fix create_makefile_script.py location message for container build --- fre/make/create_makefile_script.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fre/make/create_makefile_script.py b/fre/make/create_makefile_script.py index 5581130a..5aa6387b 100644 --- a/fre/make/create_makefile_script.py +++ b/fre/make/create_makefile_script.py @@ -75,7 +75,7 @@ def makefile_create(yamlfile,platform,target): for c in fremakeYaml['src']: freMakefile.addComponent(c['component'],c['requires'],c['makeOverrides']) freMakefile.writeMakefile() - click.echo("\nMakefile created at " + bldDir + "/Makefile" + "\n") + click.echo("\nMakefile created at " + tmpDir + "/Makefile" + "\n") @click.command() def _makefile_create(yamlfile,platform,target): From 2d349a88f4f6ba3a64e0ffc6b37370fd50b46142 Mon Sep 17 00:00:00 2001 From: Dana Singh <115384427+singhd789@users.noreply.github.com> Date: Wed, 11 Dec 2024 12:24:18 -0500 Subject: [PATCH 2/4] Update buildBaremetal.py print statement --- fre/make/gfdlfremake/buildBaremetal.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fre/make/gfdlfremake/buildBaremetal.py b/fre/make/gfdlfremake/buildBaremetal.py index 9e742980..9ac41854 100644 --- a/fre/make/gfdlfremake/buildBaremetal.py +++ b/fre/make/gfdlfremake/buildBaremetal.py @@ -150,4 +150,4 @@ def run(self): print(f"\nThere was an error running {self.bld}/compile.sh") print(f"Check the log file: {self.bld}/log.compile") else: - print(f"\nSuccessful run of {self.bld}/compile.sh") + print(f"\nSuccessful creation of {self.bld}/compile.sh") From 097e7727ce6ce95996a9de9046d02ad5bb13e36d Mon Sep 17 00:00:00 2001 From: Dana Singh <115384427+singhd789@users.noreply.github.com> Date: Wed, 11 Dec 2024 12:40:42 -0500 Subject: [PATCH 3/4] Undo last edit --- fre/make/gfdlfremake/buildBaremetal.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fre/make/gfdlfremake/buildBaremetal.py b/fre/make/gfdlfremake/buildBaremetal.py index 9ac41854..9e742980 100644 --- a/fre/make/gfdlfremake/buildBaremetal.py +++ b/fre/make/gfdlfremake/buildBaremetal.py @@ -150,4 +150,4 @@ def run(self): print(f"\nThere was an error running {self.bld}/compile.sh") print(f"Check the log file: {self.bld}/log.compile") else: - print(f"\nSuccessful creation of {self.bld}/compile.sh") + print(f"\nSuccessful run of {self.bld}/compile.sh") From 2b172bb06ab831de24513fcfc365075212da5bec Mon Sep 17 00:00:00 2001 From: Dana Singh <115384427+singhd789@users.noreply.github.com> Date: Mon, 16 Dec 2024 11:28:24 -0500 Subject: [PATCH 4/4] Update create_makefile_script.py --- fre/make/create_makefile_script.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fre/make/create_makefile_script.py b/fre/make/create_makefile_script.py index 5aa6387b..ea6845f2 100644 --- a/fre/make/create_makefile_script.py +++ b/fre/make/create_makefile_script.py @@ -63,7 +63,7 @@ def makefile_create(yamlfile,platform,target): else: image="ecpe4s/noaa-intel-prototype:2023.09.25" bldDir = platform["modelRoot"] + "/" + fremakeYaml["experiment"] + "/exec" - tmpDir = "tmp/"+platformName + tmpDir = "./tmp/"+platformName freMakefile = makefilefre.makefileContainer(exp = fremakeYaml["experiment"], libs = fremakeYaml["container_addlibs"], srcDir = srcDir,