Merge pull request #246 from rem1776/run-fremake-fix

update function names for run_fremake subcommand
NOAA-GFDL · Nov 4, 2024 · 564be4a · 564be4a
2 parents c826804 + ee4b5b5
commit 564be4a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/fre/make/gfdlfremake/checkout.py b/fre/make/gfdlfremake/checkout.py
@@ -111,7 +111,7 @@ def finish (self,pc):
 ## TODO: batch script building
     def run (self):
         """
-        Brief: Changes the permission on the checkout script and runs it
+        Brief: Runs the checkout script
         Param:
             - self The checkout script object
         """

diff --git a/fre/make/runFremake.py b/fre/make/runFremake.py
@@ -15,7 +15,7 @@
     targetfre, varsfre, yamlfre, checkout,
     makefilefre, buildDocker, buildBaremetal )
 
-def _fremake_run(yamlfile,platform,target,parallel,jobs,no_parallel_checkout,verbose):
+def fremake_run(yamlfile,platform,target,parallel,jobs,no_parallel_checkout,verbose):
     ''' run fremake via click'''
     yml = yamlfile
     name = yamlfile.split(".")[0]
@@ -86,6 +86,7 @@ def _fremake_run(yamlfile,platform,target,parallel,jobs,no_parallel_checkout,ver
                 freCheckout = checkout.checkout("checkout.sh",srcDir)
                 freCheckout.writeCheckout(modelYaml.compile.getCompileYaml(),jobs,pc)
                 freCheckout.finish(pc)
+                os.chmod(srcDir+"/checkout.sh", 0o744)
                 ## TODO: Options for running on login cluster?
                 freCheckout.run()
 
@@ -200,12 +201,12 @@ def _fremake_run(yamlfile,platform,target,parallel,jobs,no_parallel_checkout,ver
             pool.map(buildBaremetal.fremake_parallel,fremakeBuildList)
 
 @click.command()
-def fremake_run(yamlfile,platform,target,parallel,jobs,no_parallel_checkout,verbose):
+def _fremake_run(yamlfile,platform,target,parallel,jobs,no_parallel_checkout,verbose):
     '''
     Decorator for calling _fremake_run - allows the decorated version
     of the function to be separate from the undecorated version
     '''
-    return _fremake_run(yamlfile,platform,target,parallel,jobs,no_parallel_checkout,verbose)
+    return fremake_run(yamlfile,platform,target,parallel,jobs,no_parallel_checkout,verbose)
 
 if __name__ == "__main__":
     fremake_run()