Merge branch 'main' of github.com:zjwegert/GridapTopOpt.jl into featu…

…re-gridap-embedded-compat

README.md

@@ -1,6 +1,6 @@
-# GridapTopOpt
+# <img src="/assets/logo.svg" alt="drawing" width="200" align="left"/> <br/><br/>GridapTopOpt
 
-[![](https://img.shields.io/badge/docs-stable-blue.svg)](https://zjwegert.github.io/GridapTopOpt.jl/stable) [![Build Status](https://github.com/zjwegert/GridapTopOpt.jl/actions/workflows/ci.yml/badge.svg)](https://github.com/zjwegert/GridapTopOpt.jl/actions) [![Codecov](https://codecov.io/gh/zjwegert/GridapTopOpt.jl/branch/main/graph/badge.svg)](https://codecov.io/gh/zjwegert/GridapTopOpt.jl)
+[![](https://img.shields.io/badge/docs-stable-blue.svg)](https://zjwegert.github.io/GridapTopOpt.jl/stable) [![](https://img.shields.io/badge/docs-dev-blue.svg)](https://zjwegert.github.io/GridapTopOpt.jl/dev) [![Build Status](https://github.com/zjwegert/GridapTopOpt.jl/actions/workflows/ci.yml/badge.svg)](https://github.com/zjwegert/GridapTopOpt.jl/actions) [![Codecov](https://codecov.io/gh/zjwegert/GridapTopOpt.jl/branch/main/graph/badge.svg)](https://codecov.io/gh/zjwegert/GridapTopOpt.jl)
 
 GridapTopOpt is computational toolbox for level set-based topology optimisation implemented in Julia and the [Gridap](https://github.com/gridap/Gridap.jl) package ecosystem. See the documentation and following publication for further details:
 

scripts/Benchmarks/generate_benchmark_scripts.jl

@@ -96,7 +96,7 @@ phys_types = [
 ];
 
 # Template
-template = read("$(ENV["SCRATCH"])/$dir_name/scripts/Benchmarks/jobtemplate_gadi.sh",String)
+template = read("$(ENV["SCRATCH"])/$dir_name/scripts/Benchmarks/jobtemplate.sh",String)
 
 ## Generate Jobs
 jobs_by_phys = map(x->(x[1],generate_jobs(template,x[1],x[2],x[3])),phys_types);

scripts/Benchmarks/jobtemplate.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #PBS -P np01
-#PBS -q normal 
+#PBS -q normal
 #PBS -N "{{:name}}"
 #PBS -l ncpus={{:ncpus}}
 #PBS -l mem={{:mem}}GB
@@ -12,7 +12,7 @@ source $HOME/hpc-environments/gadi/load-intel.sh
 PROJECT_DIR=$SCRATCH/{{:dir_name}}/
 
 mpiexec -n {{:ncpus}} julia --project=$PROJECT_DIR --check-bounds no -O3 \
-    $PROJECT_DIR/scripts/Benchmarks/benchmark_gadi.jl \
+    $PROJECT_DIR/scripts/Benchmarks/benchmark.jl \
     {{:name}} \
     {{{:write_dir}}} \
     {{:type}} \