Merge pull request #23 from SeisSol/thomas/update_dr_cpp

sebwolf-de · web-flow · commit e4d8eb9d0125 · 2022-11-07T15:08:31.000+01:00
dr/cpp related changes
diff --git a/Dockerfile b/Dockerfile
@@ -105,6 +105,7 @@ RUN git clone https://github.com/SeisSol/easi \
 
 RUN git clone https://github.com/SeisSol/SeisSol.git \
     && cd SeisSol \
+    && git checkout 973cc45 \
     && git submodule update --init \
     && mkdir build_hsw && cd build_hsw \
     && export PATH=$PATH:/home/tools/bin \
diff --git a/How-to-build.md b/How-to-build.md
@@ -1,23 +1,25 @@
 # How to build and deploy the docker container
 Normally, the container would be built in a github action and automatically deployed.
 During a pull request, the github action will build and deploy the image `seissol/training:pr-<id>`, where `id` is the id of the pull request on github.
+After a merge, the CI will build and push `seissol/training:master`.
 Once a tag in the form `v1.2.3` is released on github, the pipeline will push to `seissol/training:v1.2.3` and to `seissol/training:latest`.
 
 During build time of the container, it will fetch and build:
 * ASAGI latest github revision
 * ImpalaJIT latest github revision
 * PROJ version 4.9.3
 * SCOREC latest github revision
-* SeisSol latest github revision
+* SeisSol 80a266e
 * easi latest github revision
 * eigen3 version 3.4.0
 * gmsh version 4.8.4
 * hdf5 version 1.10.7
 * libxsmm version 1.16.1
+* lua version 5.3.6
 * netcdf version 4.7.4
 * parmetis version 4.0.3
 * pumgen latest github revision
-* rconv lateste github revision
+* rconv same commit as SeisSol
 
 # Manual build
 Although everything should be handled by the github actions, you might want to build and test the docker container locally:
diff --git a/kaikoura/NZ_faultLSW.yaml b/kaikoura/NZ_faultLSW.yaml
@@ -27,3 +27,8 @@
       }
       end
 [s_xx, s_yy, s_zz, s_xy, s_yz, s_xz]: !Include NZ_initial_stressLSW.yaml
+[Tnuc_n, Tnuc_s, Tnuc_d]: !ConstantMap
+    map:
+        Tnuc_n: 0
+        Tnuc_s: 0
+        Tnuc_d: 0
diff --git a/kaikoura/NZ_faultRS.yaml b/kaikoura/NZ_faultRS.yaml
@@ -12,9 +12,9 @@
      1500.0:  [0.02]
      -4000.0: [0.01]
      -10e10:   [0.01]
-[RS_sl0]: !ConstantMap
+[rs_sl0]: !ConstantMap
   map:
-    RS_sl0: 0.2
+    rs_sl0: 0.2
 [rs_srW]: !IdentityMap
   components:
     #we remove the characteristic velocity increase in CCFZ to help the rupture
diff --git a/kaikoura/parametersRS.par b/kaikoura/parametersRS.par
@@ -27,9 +27,9 @@ ModelFileName = 'NZ_faultRS.yaml'
 RS_f0 = 0.6
 RS_sr0 = 1d-6
 RS_b = 0.014
-Mu_W=0.1
+RS_MuW=0.1
 RS_iniSlipRate1 = 1d-16
-RS_iniSlipRate2 = 0d0
+RS_iniSlipRate2 = 0.0
 t_0 = 0.5
 
 !reference vector for defining strike and dip direction
diff --git a/sulawesi/Sulawesi_faultLSW.yaml b/sulawesi/Sulawesi_faultLSW.yaml
@@ -20,3 +20,8 @@
       }
       return 1000000000.0;
 [s_xx, s_yy, s_zz, s_xy, s_yz, s_xz]: !Include Sulawesi_initial_stressLSW.yaml
+[Tnuc_n, Tnuc_s, Tnuc_d]: !ConstantMap
+    map:
+        Tnuc_n: 0
+        Tnuc_s: 0
+        Tnuc_d: 0
diff --git a/sulawesi/Sulawesi_faultRS.yaml b/sulawesi/Sulawesi_faultRS.yaml
@@ -12,9 +12,9 @@
      1500.0:  [0.02]
      -4000.0: [0.01]
      -10e10:   [0.01]
-[RS_sl0]: !ConstantMap
+[rs_sl0]: !ConstantMap
   map:
-    RS_sl0: 0.2
+    rs_sl0: 0.2
 [rs_srW]: !LayeredModel
       map: !AffineMap
         matrix:
diff --git a/sulawesi/parametersRS.par b/sulawesi/parametersRS.par
@@ -29,9 +29,9 @@ ModelFileName = 'Sulawesi_faultRS.yaml'
 RS_f0 = 0.6
 RS_sr0 = 1d-6
 RS_b = 0.014
-Mu_W=0.1
+RS_MuW=0.1
 RS_iniSlipRate1 = 1d-16
-RS_iniSlipRate2 = 0d0
+RS_iniSlipRate2 = 0.0
 t_0 = 0.5
 
 !reference vector for defining strike and dip direction
@@ -90,7 +90,6 @@ TimeInterval = 5.                              ! Index of printed info at time
 refinement = 2
 
 ! off-fault ascii receivers
-nRecordPoints = 33                             ! number of Record points which are read from file
 RFileName = 'GPSfiltered_proj_200m_8e6.dat'    ! Record Points in extra file
 pickdt = 0.01                                  ! Pickpoint Sampling
 pickDtType = 1                                 ! Pickpoint Type
diff --git a/tpv13/parameters.par b/tpv13/parameters.par
@@ -17,7 +17,7 @@ BC_of = 1                                      ! enable absorbing boundaries
 
 &DynamicRupture
 ! linear slip-weakening friction
-FL = 2                                        ! Friction law  
+FL = 16                                        ! Friction law  
 !yaml file defining spatial dependence of fault properties
 ModelFileName = 'tpv12_13_fault.yaml'
 
diff --git a/tpv13/tpv12_13_fault.yaml b/tpv13/tpv12_13_fault.yaml
@@ -21,8 +21,9 @@
         mu_d:        0.10
         d_c:         0.50
         cohesion: -200000
-[Tnuc_n, Tnuc_s, Tnuc_d]: !ConstantMap
+[Tnuc_n, Tnuc_s, Tnuc_d, forced_rupture_time]: !ConstantMap
     map:
         Tnuc_n: 0
         Tnuc_s: 0
         Tnuc_d: 0
+        forced_rupture_time: 1e10

Original file line number	Diff line number	Diff line change
`@@ -27,3 +27,8 @@`
`27`	`27`	`}`
`28`	`28`	`end`
`29`	`29`	`[s_xx, s_yy, s_zz, s_xy, s_yz, s_xz]: !Include NZ_initial_stressLSW.yaml`
	`30`	`+[Tnuc_n, Tnuc_s, Tnuc_d]: !ConstantMap`
	`31`	`+ map:`
	`32`	`+ Tnuc_n: 0`
	`33`	`+ Tnuc_s: 0`
	`34`	`+ Tnuc_d: 0`
Original file line number	Diff line number	Diff line change
`@@ -20,3 +20,8 @@`
`20`	`20`	`}`
`21`	`21`	`return 1000000000.0;`
`22`	`22`	`[s_xx, s_yy, s_zz, s_xy, s_yz, s_xz]: !Include Sulawesi_initial_stressLSW.yaml`
	`23`	`+[Tnuc_n, Tnuc_s, Tnuc_d]: !ConstantMap`
	`24`	`+ map:`
	`25`	`+ Tnuc_n: 0`
	`26`	`+ Tnuc_s: 0`
	`27`	`+ Tnuc_d: 0`