From b619ff51ab58a5f38aa668d688ff224028be839b Mon Sep 17 00:00:00 2001
From: Jourdain <jourdain@cines.fr>
Date: Fri, 18 Dec 2020 14:45:37 +0100
Subject: [PATCH] Specfem: Reorder and clean compilation script

---
 specfem3d/compile.sh | 82 ++++++++++++++++++++++----------------------
 1 file changed, 41 insertions(+), 41 deletions(-)

diff --git a/specfem3d/compile.sh b/specfem3d/compile.sh
index 7300087..690679f 100755
--- a/specfem3d/compile.sh
+++ b/specfem3d/compile.sh
@@ -1,5 +1,4 @@
 #!/bin/bash
-
 echo "==> Choose supercomputer :"
 echo "     - occigen"
 echo "     - marenostrum "
@@ -22,26 +21,27 @@ Untar(){
     echo "==> Untar "
     #Clone the repository
     cd $install_dir
-    git -c http.sslVerify=false clone  https://github.com/geodynamics/specfem3d_globe.git
+    #git -c http.sslVerify=false clone  https://github.com/geodynamics/specfem3d_globe.git
     cd specfem3d_globe/
     # Checkout of 31 ocotbre 2017 version
-    git checkout b1d6ba966496f269611eff8c2cf1f22bcdac2bd9
+    #git checkout b1d6ba966496f269611eff8c2cf1f22bcdac2bd9
+    
     # Checkout v7.0.2, last version : unstable : tested on differents architectures and all simulations failed
     #git checkout v7.0.2
 
     #Copy sources
-    #source_dir=$HOME/git/specfem3d_globe
-    #echo "Copy source"
-    #cp -r $source_dir $install_dir
+    source_dir=$HOME/git/specfem3d_globe
+    echo "Copy source"
+    cp -r $source_dir $install_dir
     cd $ueabs_dir
 }
 
 Install(){
     echo "===>  Configure "
     answer=0
-    echo "1. Test Case A is designed to run on Tier-1 sized systems (up to around 1,000 x86 cores, or equivalent)"
-    echo "2. Test Case B is designed to run on Tier-0 sized systems (up to around 10,000 x86 cores, or equivalent)"
-    echo "3. small_benchmark_run_to_test_more_complex_Earth : specfem3D_globe native benchmark to validate the behaviour of the code designed to run on 1 or 2 node(s)"
+    echo "1. small_benchmark_run_to_test_more_complex_Earth : specfem3D_globe native benchmark to validate the behaviour of the code designed to run on 24 MPI process"
+    echo "2. Test Case A is designed to run on Tier-1 sized systems (up to around 1,000 x86 cores, or equivalent)"
+    echo "3. Test Case B is designed to run on Tier-0 sized systems (up to around 10,000 x86 cores, or equivalent)"
     while true
     do
         echo "===> Choose Test Case : (1, 2, or 3)"
@@ -49,31 +49,31 @@ Install(){
         if [[ $answer -eq 1 || $answer -eq 2 || $answer -eq 3 ]]; then break;fi
     done
     if [ $answer = "1" ]; then
+	echo "===> small_benchmark_run_to_test_more_complex_Earth"
+	cd $install_dir/specfem3d_globe/EXAMPLES/small_benchmark_run_to_test_more_complex_Earth
+	sed -i "38a ./configure  --enable-openmp" run_this_example.sh
+	echo "compilation proccess will be done directly in the job"
+	exit 
+    elif [ $answer = "2" ]; then
         echo "===> Copy test case A"
 	export install_dir=$install_dir/TestCaseA
 	mkdir -p $install_dir
 	mv $install_dir/../specfem3d_globe  $install_dir/.
         cp test_cases/SPECFEM3D_TestCaseA/* $install_dir/specfem3d_globe/DATA/.
-    elif [ $answer = "2" ]; then
+    elif [ $answer = "3" ]; then
         echo "===> Copy test case B"
 	export install_dir=$install_dir/TestCaseB
 	mkdir -p $install_dir
 	mv $install_dir/../specfem3d_globe  $install_dir/.
         cp test_cases/SPECFEM3D_TestCaseB/* $install_dir/specfem3d_globe/DATA/.
-    elif [ $answer = "3" ]; then
-	echo "===> small_benchmark_run_to_test_more_complex_Earth"
-	cd $install_dir/specfem3d_globe/EXAMPLES/small_benchmark_run_to_test_more_complex_Earth
-	sed -i "38a ./configure  --enable-openmp" run_this_example.sh
-	echo "compilation proccess will be done directly in the job"
-	exit 
     fi
     cd $install_dir/specfem3d_globe
     if [ $machine = "daint-gpu" ] || [ $machine = "davide" ]; then
 	echo "Configure for CPU+GPU system"
 	### replace `use mpi` if needed ###
 	#cd utils
- 	#perl replace_use_mpi_with_include_mpif_dot_h.pl
- 	#cd ..
+	#perl replace_use_mpi_with_include_mpif_dot_h.pl
+	#cd ..
 	sed -i s/"GPU_MODE                        = .false."/"GPU_MODE                        = .true."/g  $install_dir/specfem3d_globe/DATA/Par_file
 	if [ $machine = "daint-gpu" ];then
 		export MPI_INC=$MPICH_DIR/include
@@ -96,29 +96,29 @@ Install(){
 }
 
 Clean(){
-	if [ ! -z "$install_dir" ] && [ -d $install_dir ];then
-		echo "==> Clean installation directory"
-		answer=0
-		while true
-                do
-                    echo "===> Choose Test Case to delete : (1, 2, or 3)"
-                    echo "1 : $install_dir/TestCaseA"
-                    echo "2 : $install_dir/TestCaseB"
-                    echo "3 : Not necessary to delete this folder"
-                    read answer
-                    if [[ $answer -eq 1 || $answer -eq 2 || $answer -eq 3 ]]; then break;fi
-                done
-                if [ $answer = "1" ]; then
-                        rm -rf $install_dir/TestCaseA
-                elif [ $answer = "2" ]; then
-                        rm -rf $install_dir/TestCaseB
-                else
-			echo "Nothing has been deleted"
-                fi
-	else
-		echo "Error with install_dir variable"
-		exit
-	fi
+    if [ ! -z "$install_dir" ] && [ -d $install_dir ];then
+	    echo "==> Clean installation directory"
+	    answer=0
+	    while true
+            do
+                echo "===> Choose Test Case to delete : (1, 2, or 3)"
+                echo "1 : Not necessary to delete this folder"
+                echo "2 : $install_dir/TestCaseA"
+                echo "3 : $install_dir/TestCaseB"
+                read answer
+                if [[ $answer -eq 1 || $answer -eq 2 || $answer -eq 3 ]]; then break;fi
+            done
+            if [ $answer = "2" ]; then
+                    rm -rf $install_dir/TestCaseA
+            elif [ $answer = "3" ]; then
+                    rm -rf $install_dir/TestCaseB
+            else
+		    echo "Nothing has been deleted"
+            fi
+    else
+	    echo "Error with install_dir variable"
+	    exit
+    fi
 }
 
 Deploy(){
-- 
GitLab