Added jobscript to bin folder

bin/jobscript.sh

+#!/bin/bash -l
+#SBATCH --job-name="rbc_rt_7"
+#SBATCH --account="eth5b"
+#SBATCH --mail-type=ALL
+#SBATCH --mail-user=engelerp@phys.ethz.ch
+#SBATCH --time=00:50:00
+#SBATCH --nodes=1
+#SBATCH --ntasks-per-core=2
+#SBATCH --ntasks-per-node=1
+#SBATCH --cpus-per-task=72
+#SBATCH --partition=normal
+#SBATCH --constraint=mc
+#SBATCH --hint=multithread
+
+export OMP_NUM_THREADS=$SLURM_CPUS_PER_TASK
+
+srun ./main 1> image.ppm 2> dbg.txt

src/camera.cpp

@@ -12,7 +12,7 @@ camera::camera(){
   horizontal = vec3(viewport_width, 0., 0.);
   vertical = vec3(0., viewport_height, 0.);
   lower_left_corner = origin - horizontal/2. - vertical/2. - vec3(0., 0., focal_length);
-  max_bounces = 5;
+  max_bounces = 13;
 }
 
 camera::camera(double aspect_ratio, double viewport_height, double viewport_width, double focal_length){

src/main.cpp

@@ -13,6 +13,7 @@
 #include <quartic_deformer.hpp>
 #include <quadratic_deformer.hpp>
 #include <linear_deformer.hpp>
+#include <interpolating_deformer.hpp>
 #include <constant_deformer.hpp>
 #include <wavelength2rgb.hpp>
 #include <chrono>
@@ -105,8 +106,8 @@ int main(){
   #endif
 
   /*Image*/
-  const int image_width = 256;
-  const int image_height = 256;
+  const int image_width = 512;
+  const int image_height = 512;
 
   /*World*/
   hittable_list world;
@@ -136,14 +137,15 @@ int main(){
   }
 */
   /*Mesh deformers*/
+  double extra_gap = 0.0015;
   /*Si3N4*/
   constant_deformer top_def_si_air(-1.6192);
   constant_deformer top_def_si_sio2(-1.9992);
   constant_deformer top_def_sio2_si3n4(-1.9995);
   constant_deformer top_def_const_1(-1.9995);
   constant_deformer top_def_const_2(-2.);
-  constant_deformer bot_def_const_1(-2.001);
-  constant_deformer bot_def_const_2(-2.0015);
+  constant_deformer bot_def_const_1(-2.001-extra_gap);
+  constant_deformer bot_def_const_2(-2.0015-extra_gap);
   /*
   quartic_deformer  top_def_quart_1(0.0009, -1.9995, 1., vec3(0., 0., 0.));
   quartic_deformer  top_def_quart_2(0.0009, -2.0000, 1., vec3(0., 0., 0.));
@@ -164,6 +166,7 @@ int main(){
   quadratic_deformer  bot_def_quad_d1_2(0.000999, -2.0015, -1., vec3(-0.6581793068761733, -0.38, 0.));
   quadratic_deformer  bot_def_quad_d2_2(0.000999, -2.0015, -1., vec3(0.6581793068761733, -0.38, 0.));
   */
+  /*
   linear_deformer  top_def_quad_1(0.000999, -1.9995, 1., vec3(0., 0., 0.));
   linear_deformer  top_def_quad_2(0.000999, -2.0000, 1., vec3(0., 0., 0.));
   linear_deformer  bot_def_quad_d0_1(0., -2.001, -1., vec3(0., 0.76, 0.));
@@ -172,9 +175,18 @@ int main(){
   linear_deformer  bot_def_quad_d0_2(0., -2.0015, -1., vec3(0., 0.76, 0.));
   linear_deformer  bot_def_quad_d1_2(0., -2.0015, -1., vec3(-0.6581793068761733, -0.38, 0.));
   linear_deformer  bot_def_quad_d2_2(0., -2.0015, -1., vec3(0.6581793068761733, -0.38, 0.));
-  constant_deformer bot_def_sio2_si3n4(-2.0015);
-  constant_deformer bot_def_si_sio2(-2.0018);
-  constant_deformer bot_def_si_air(-2.3818);
+  */
+  interpolating_deformer  top_def_quad_1("../resources/deformer_0.dat", 0.000999+extra_gap, -1.9995, 1., vec3(0., 0., 0.));
+  interpolating_deformer  top_def_quad_2("../resources/deformer_0.dat", 0.000999+extra_gap, -2.0000, 1., vec3(0., 0., 0.));
+  interpolating_deformer  bot_def_quad_d0_1("../resources/deformer_0.dat", 0., -2.001-extra_gap, -1., vec3(0., 0.76, 0.));
+  interpolating_deformer  bot_def_quad_d1_1("../resources/deformer_0.dat", 0., -2.001-extra_gap, -1., vec3(-0.6581793068761733, -0.38, 0.));
+  interpolating_deformer  bot_def_quad_d2_1("../resources/deformer_0.dat", 0., -2.001-extra_gap, -1., vec3(0.6581793068761733, -0.38, 0.));
+  interpolating_deformer  bot_def_quad_d0_2("../resources/deformer_0.dat", 0., -2.0015-extra_gap, -1., vec3(0., 0.76, 0.));
+  interpolating_deformer  bot_def_quad_d1_2("../resources/deformer_0.dat", 0., -2.0015-extra_gap, -1., vec3(-0.6581793068761733, -0.38, 0.));
+  interpolating_deformer  bot_def_quad_d2_2("../resources/deformer_0.dat", 0., -2.0015-extra_gap, -1., vec3(0.6581793068761733, -0.38, 0.));
+  constant_deformer bot_def_sio2_si3n4(-2.0015-extra_gap);
+  constant_deformer bot_def_si_sio2(-2.0018-extra_gap);
+  constant_deformer bot_def_si_air(-2.3818-extra_gap);
 
   /*Top Wafer*/
   //world.add(std::make_shared<triangle_mesh>("../meshes/mesh_top_tot.dat", material_si3n4, 1., &top_def_const_1));