Merge pull request #7 from gjbex/development

Consistency fix

Author: gjbex

.gitignore

@@ -107,5 +107,9 @@ venv.bak/
 *~
 *.swp
 *.bak
-~$scientific_python.pptx
+
+# Powerpoint backup files
 ~$python_hpc.pptx
+
+# direnv files
+.envrc 

source-code/dask/julia_set/julia_set_dask.pbs

@@ -7,7 +7,7 @@
 cd $PBS_O_WORKDIR
 
 source "conda.sh"
-conda activate dask
+conda activate python_for_hpc
 
 if [ $? -ne 0 ]
 then

source-code/dask/julia_set/launch_scheduler.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 source "conda.sh"
-conda activate dask 2> /dev/null
+conda activate python_for_hpc 2> /dev/null
 if [ $? -ne 0 ]
 then
     (>&2 echo '### error: conda environment not sourced correctly' )

source-code/dask/julia_set/launch_worker.sh

@@ -18,7 +18,7 @@ JOBID=$3
 cd "${WORK_DIR}"
 
 source "conda.sh"
-conda activate dask 2> /dev/null
+conda activate python_for_hpc 2> /dev/null
 if [ $? -ne 0 ]
 then
     (>&2 echo '### error: conda environment not sourced correctly' )