Rupture Variation Generator v5.5.2 code changes - Revision history

Scottcal at 20:18, 2 November 2022

2022-11-02T20:18:02Z

Scottcal: /* function.h */

2022-10-29T03:23:33Z

function.h

Scottcal: /* genslip-v5.5.2.c */

2022-10-29T03:21:07Z

genslip-v5.5.2.c

Scottcal: /* Installing files */

2022-10-27T22:09:08Z

Installing files

Scottcal: /* Compiling */

2022-10-27T22:01:47Z

Compiling

Scottcal: /* genslip-v5.5.2.c */

2022-10-27T22:01:31Z

genslip-v5.5.2.c

Scottcal: /* genslip-v5.5.2.c */

2022-10-27T21:57:19Z

genslip-v5.5.2.c

Scottcal: /* Function name changes */

2022-10-27T21:52:00Z

Function name changes

Scottcal: /* Function name changes */

2022-10-27T21:51:37Z

Function name changes

Scottcal: /* genslip-v5.5.2.c */

2022-10-27T21:45:52Z

genslip-v5.5.2.c

@@ Line 798: / Line 798: @@
 sed -i 's/SORT/SORT1/g' */*.f
 </pre>
 == Compiling ==
 Go back into the src directory and try to compile it with 'make'.

@@ Line 169: / Line 169: @@
 <li>Add an entry for zapit:
 <pre>void zapit(float* s,int n);</pre></li>
 <li>At the end of the file, add:
 <pre>

@@ Line 673: / Line 673: @@
 float half_flen_plus_shypo = 0.5*flen + shypo;
 y0 = (deep_vrdep1-dtop)/sin(avgdip*rperd);
-float deep_alpha = 1.0 + (deep_vrdep1-deep_rup*deep_vrdep1)/(deep_vrdep2-deep_vrdep1);
+float deep_alpha = 1.0 + (deep_vrdep1-deep_vrup*deep_vrdep1)/(deep_vrdep2-deep_vrdep1);
-float deep_const = (deep_rup - 1.0)/(deep_vrdep2-deep_vrdep1);
+float deep_const = (deep_vrup - 1.0)/(deep_vrdep2-deep_vrdep1);
 </pre></li>
 <li>Replace

@@ Line 44: / Line 44: @@
 <li>sliprate_subs.c</li>
 <li>srf_subs.c (from StandRupFormat)</li>
 <li>wafront2d-rwg.f</li>
 <li>makefile</li>

← Older revision		Revision as of 22:01, 27 October 2022
Line 797:		Line 797:

	Go back into the src directory and try to compile it with 'make'.		Go back into the src directory and try to compile it with 'make'.
−
−	~~With v5.4.2, we are not including the -fno-expensive-optimizations flag, since backwards compatibility with Blue Waters and Titan isn't an issue.~~

@@ Line 549: / Line 549: @@
 </pre></li>
 <li>In line 750-52, change all the 'srf.version' to 'srf->version'.
 <li>In line 1025, change
 <pre> psrc_orig = read_ruppars(infile,psrc_orig,&mag,&nstk,&ndip,&dstk,&ddip,&dtop,&avgstk,&avgdip,&elon,&elat);</pre>
@@ Line 651: / Line 655: @@
        dhypo = hypo_d0 + (js/nhypo_s)*hypo_dd;
 </pre></li>
 <li>In line 2653, in the load_slip_srf_dd4() call, change '&srf' to 'srf'.</li>
 <li>In the for loop starting in line 2742, starting with for(j=0;j<ndip;j++), we replace some of these calculations with refactored ones to pull out constants and take advantage of FMA.  Specifically, make the following changes:

@@ Line 509: / Line 509: @@
 #endif
 </pre></li>
 <li>In line 444, after
 <pre>struct velmodel rvmod;</pre>

@@ Line 768: / Line 768: @@
 This might accidentally convert a 'write' to 'w_rite', and you might end up with _f_opfile and __opfile_ro; fix those with
-<pre> sed -i 's/w_rite/write/g' *.c *.h */*.c */*.h
+<pre>sed -i 's/w_rite/write/g' *.c *.h */*.c */*.h
 sed -i 's/__opfile_ro/_opfile_ro/g' *.c *.h */*.c */*.h
-sed -i 's/_f_opfile/_f_opfile/g' *.c *.h */*.c */*.h
+sed -i 's/_f_opfile/_fopfile/g' *.c *.h */*.c */*.h
 </pre>

@@ Line 767: / Line 767: @@
 *gen_brune_stf
-This might accidentally convert a 'write' to 'w_rite'; fix that with
+This might accidentally convert a 'write' to 'w_rite', and you might end up with _f_opfile and __opfile_ro; fix those with
-<pre> sed -i 's/w_rite/write/g' *.c *.h */*.c */*.h</pre>
+<pre> sed -i 's/w_rite/write/g' *.c *.h */*.c */*.h
 and also run (since Fortran function names can't start with an underscore, but are case insensitive):

@@ Line 543: / Line 543: @@
 getpar("dohypo","d",&dohypo);
 </pre></li>
-<li>In line 707-9, change all the 'srf.version' to 'srf->version'.
+<li>In line 750-52, change all the 'srf.version' to 'srf->version'.
-<li>In line 959, change
+<li>In line 1025, change
 <pre> psrc_orig = read_ruppars(infile,psrc_orig,&mag,&nstk,&ndip,&dstk,&ddip,&dtop,&avgstk,&avgdip,&elon,&elat);</pre>
 to
@@ Line 554: / Line 554: @@
 #endif
 </pre></li>
-<li>In line 1012, change '&srf' to 'srf'.</li>
+<li>In line 1077, in the init_plane_srf() call, change '&srf' to 'srf'.</li>
-<li>In line 1016, change '&srf' to 'srf'.</li>
+<li>In line 1081, in the get_seg_bounds() call, change '&srf' to 'srf'.</li>
-<li>In line 1315, after 'dhypo = dhypo_frac*fwid;', add:
+<li>In line 1393, after 'dhypo = dhypo_frac*fwid;', add:
 <pre>
 stats->numslip = ns;
@@ Line 584: / Line 584: @@
     free(dip_r);
     free(psrc_rake);
     return 0;
+}
 if (dohypo>=nh) {
@@ Line 602: / Line 611: @@
+}
 </pre></li>
-<li>In line 1363, after:
+<li>In line 1470, after:
 <pre>
 for(js=0;js<ns;js++)    /* loop over slip/rupture realizations */
@@ Line 619: / Line 628: @@
+    }
 </pre></li>
-<li>In lines 1394-1403, change iterative calculation of shypo and dhypo to explicit.  Delete
+<li>In lines 1500-1509, change iterative calculation of shypo and dhypo to explicit.  Delete
 <pre>
 if(ih_scnt == nhypo_s)
@@ Line 637: / Line 646: @@
        dhypo = hypo_d0 + (js/nhypo_s)*hypo_dd;
 </pre></li>
-<li>In line 2394, change '&srf' to 'srf'.</li>
+<li>In line 2653, in the load_slip_srf_dd4() call, change '&srf' to 'srf'.</li>
-<li>In the for loop starting in line 2452, we replace some of these calculations with refactored ones to pull out constants and take advantage of FMA.  Specifically, make the following changes:
+<li>In the for loop starting in line 2742, starting with for(j=0;j<ndip;j++), we replace some of these calculations with refactored ones to pull out constants and take advantage of FMA.  Specifically, make the following changes:
 <ol>
 <li>Before the for loop, define the following variables:
@@ Line 671: / Line 680: @@
 </ol>
 </li>
-<li>In line 2573, after 'psrc[j].rupt = psrc[j].rupt - tsmin + rupture_delay;', add:
+<li>In line 2862, after 'psrc[j].rupt = psrc[j].rupt - tsmin + rupture_delay;', add:
 <pre>
 if (dohypo!=ih || doslip!=js) {
@@ Line 677: / Line 686: @@
+}
 </pre></li>
-<li>In line 2601, change '&srf' to 'srf'.</li>
+<li>In line 2869, in the load_rupt_srf() call, change '&srf' to 'srf'.</li>
-<li>In line 2611, remove
+<li>In line 2892, remove:
 <pre> write2srf(srf,str,outbin);</pre>
 Writing out SRFs is done by calling write_srf() on the srf object.</li>
 <li>At the very end of the function, we want to free everything not needed by the SRF object.  Add:
 <pre>
@@ Line 719: / Line 728: @@
 free(rvmod.th);
 free(rvmod.invb2);
 return 0;