[cig-commits] r21518 - in seismo/3D/SPECFEM3D/trunk: DATA doc/USER_MANUAL examples/BENCHMARK_CLAERBOUT_ADJOINT/ACOUSTIC/DATA examples/BENCHMARK_CLAERBOUT_ADJOINT/ELASTIC/DATA examples/CPML/HOMO8_FREE_SURFACE/DATA examples/CPML/HOMO8_NOFREESURFACE/DATA examples/Mount_StHelens/DATA examples/homogeneous_halfspace_HEX27/DATA examples/homogeneous_halfspace_HEX8/DATA examples/homogeneous_poroelastic/DATA examples/layered_halfspace/DATA examples/meshfem3D_examples/many_interfaces/DATA examples/meshfem3D_examples/simple_model/DATA examples/meshfem3D_examples/socal1D/DATA examples/meshfem3D_examples/socal1D/example_utm examples/noise_tomography/DATA examples/splay_faults/DATA examples/tomographic_model/DATA examples/tpv102/DATA examples/tpv103/DATA examples/tpv15/DATA examples/tpv16/DATA examples/tpv5/DATA examples/waterlayered_halfspace/DATA src/cuda src/decompose_mesh src/generate_databases src/meshfem3D src/shared src/specfem3D utils/unused_routines/create_movie_GMT utils/unused_routines/files_needed_asteroid/DATA utils/unused_routines/from_old_DATA/lin_model utils/unused_routines/from_old_DATA/par_files
dkomati1 at geodynamics.org
dkomati1 at geodynamics.org
Tue Mar 12 17:23:43 PDT 2013
Author: dkomati1
Date: 2013-03-12 17:23:42 -0700 (Tue, 12 Mar 2013)
New Revision: 21518
Modified:
seismo/3D/SPECFEM3D/trunk/DATA/Par_file
seismo/3D/SPECFEM3D/trunk/doc/USER_MANUAL/manual_SPECFEM3D_Cartesian.pdf
seismo/3D/SPECFEM3D/trunk/doc/USER_MANUAL/manual_SPECFEM3D_Cartesian.tex
seismo/3D/SPECFEM3D/trunk/examples/BENCHMARK_CLAERBOUT_ADJOINT/ACOUSTIC/DATA/Par_file
seismo/3D/SPECFEM3D/trunk/examples/BENCHMARK_CLAERBOUT_ADJOINT/ELASTIC/DATA/Par_file
seismo/3D/SPECFEM3D/trunk/examples/CPML/HOMO8_FREE_SURFACE/DATA/Par_file
seismo/3D/SPECFEM3D/trunk/examples/CPML/HOMO8_NOFREESURFACE/DATA/Par_file
seismo/3D/SPECFEM3D/trunk/examples/Mount_StHelens/DATA/Par_file
seismo/3D/SPECFEM3D/trunk/examples/homogeneous_halfspace_HEX27/DATA/Par_file
seismo/3D/SPECFEM3D/trunk/examples/homogeneous_halfspace_HEX8/DATA/Par_file
seismo/3D/SPECFEM3D/trunk/examples/homogeneous_poroelastic/DATA/Par_file
seismo/3D/SPECFEM3D/trunk/examples/layered_halfspace/DATA/Par_file
seismo/3D/SPECFEM3D/trunk/examples/meshfem3D_examples/many_interfaces/DATA/Par_file
seismo/3D/SPECFEM3D/trunk/examples/meshfem3D_examples/simple_model/DATA/Par_file
seismo/3D/SPECFEM3D/trunk/examples/meshfem3D_examples/socal1D/DATA/Par_file
seismo/3D/SPECFEM3D/trunk/examples/meshfem3D_examples/socal1D/example_utm/Par_file_utm
seismo/3D/SPECFEM3D/trunk/examples/noise_tomography/DATA/Par_file_step1
seismo/3D/SPECFEM3D/trunk/examples/noise_tomography/DATA/Par_file_step2
seismo/3D/SPECFEM3D/trunk/examples/noise_tomography/DATA/Par_file_step3
seismo/3D/SPECFEM3D/trunk/examples/splay_faults/DATA/Par_file
seismo/3D/SPECFEM3D/trunk/examples/splay_faults/DATA/Par_file_faults.barrier
seismo/3D/SPECFEM3D/trunk/examples/splay_faults/DATA/Par_file_faults.homogeneous
seismo/3D/SPECFEM3D/trunk/examples/tomographic_model/DATA/Par_file
seismo/3D/SPECFEM3D/trunk/examples/tpv102/DATA/Par_file
seismo/3D/SPECFEM3D/trunk/examples/tpv102/DATA/Par_file_faults
seismo/3D/SPECFEM3D/trunk/examples/tpv103/DATA/Par_file
seismo/3D/SPECFEM3D/trunk/examples/tpv103/DATA/Par_file_faults
seismo/3D/SPECFEM3D/trunk/examples/tpv15/DATA/Par_file
seismo/3D/SPECFEM3D/trunk/examples/tpv15/DATA/Par_file_faults
seismo/3D/SPECFEM3D/trunk/examples/tpv16/DATA/Par_file
seismo/3D/SPECFEM3D/trunk/examples/tpv16/DATA/Par_file_faults
seismo/3D/SPECFEM3D/trunk/examples/tpv5/DATA/Par_file
seismo/3D/SPECFEM3D/trunk/examples/tpv5/DATA/Par_file_faults
seismo/3D/SPECFEM3D/trunk/examples/waterlayered_halfspace/DATA/Par_file
seismo/3D/SPECFEM3D/trunk/src/cuda/compute_coupling_cuda.cu
seismo/3D/SPECFEM3D/trunk/src/cuda/it_update_displacement_cuda.cu
seismo/3D/SPECFEM3D/trunk/src/cuda/prepare_mesh_constants_cuda.cu
seismo/3D/SPECFEM3D/trunk/src/cuda/specfem3D_gpu_cuda_method_stubs.c
seismo/3D/SPECFEM3D/trunk/src/decompose_mesh/decompose_mesh.F90
seismo/3D/SPECFEM3D/trunk/src/decompose_mesh/program_decompose_mesh.f90
seismo/3D/SPECFEM3D/trunk/src/generate_databases/create_mass_matrices.f90
seismo/3D/SPECFEM3D/trunk/src/generate_databases/create_regions_mesh.f90
seismo/3D/SPECFEM3D/trunk/src/generate_databases/generate_databases.f90
seismo/3D/SPECFEM3D/trunk/src/generate_databases/generate_databases_par.f90
seismo/3D/SPECFEM3D/trunk/src/generate_databases/memory_eval.f90
seismo/3D/SPECFEM3D/trunk/src/generate_databases/save_arrays_solver.f90
seismo/3D/SPECFEM3D/trunk/src/meshfem3D/check_mesh_quality.f90
seismo/3D/SPECFEM3D/trunk/src/meshfem3D/meshfem3D.f90
seismo/3D/SPECFEM3D/trunk/src/shared/combine_vol_data.f90
seismo/3D/SPECFEM3D/trunk/src/shared/constants.h.in
seismo/3D/SPECFEM3D/trunk/src/shared/create_movie_shakemap_AVS_DX_GMT.f90
seismo/3D/SPECFEM3D/trunk/src/shared/read_parameter_file.f90
seismo/3D/SPECFEM3D/trunk/src/shared/smooth_vol_data.f90
seismo/3D/SPECFEM3D/trunk/src/shared/sum_kernels.f90
seismo/3D/SPECFEM3D/trunk/src/specfem3D/compute_forces_viscoelastic_calling_routine.F90
seismo/3D/SPECFEM3D/trunk/src/specfem3D/initialize_simulation.f90
seismo/3D/SPECFEM3D/trunk/src/specfem3D/iterate_time.f90
seismo/3D/SPECFEM3D/trunk/src/specfem3D/model_update.f90
seismo/3D/SPECFEM3D/trunk/src/specfem3D/prepare_timerun.F90
seismo/3D/SPECFEM3D/trunk/src/specfem3D/read_mesh_databases.f90
seismo/3D/SPECFEM3D/trunk/src/specfem3D/save_external_bin_m_up.f90
seismo/3D/SPECFEM3D/trunk/src/specfem3D/specfem3D_par.f90
seismo/3D/SPECFEM3D/trunk/utils/unused_routines/create_movie_GMT/Par_file
seismo/3D/SPECFEM3D/trunk/utils/unused_routines/files_needed_asteroid/DATA/Par_file
seismo/3D/SPECFEM3D/trunk/utils/unused_routines/from_old_DATA/lin_model/Par_file
seismo/3D/SPECFEM3D/trunk/utils/unused_routines/from_old_DATA/par_files/Par_file_Carcione_copper_ori_r2d2_serial
seismo/3D/SPECFEM3D/trunk/utils/unused_routines/from_old_DATA/par_files/Par_file_Carcione_copper_very_small_serial
seismo/3D/SPECFEM3D/trunk/utils/unused_routines/from_old_DATA/par_files/Par_file_EGEE_gros
seismo/3D/SPECFEM3D/trunk/utils/unused_routines/from_old_DATA/par_files/Par_file_EGEE_petit
seismo/3D/SPECFEM3D/trunk/utils/unused_routines/from_old_DATA/par_files/Par_file_EGEE_small_4
seismo/3D/SPECFEM3D/trunk/utils/unused_routines/from_old_DATA/par_files/Par_file_SC_288
seismo/3D/SPECFEM3D/trunk/utils/unused_routines/from_old_DATA/par_files/Par_file_SC_384
Log:
replaced the OCEANS flag with APPROXIMATE_OCEAN_LOAD to avoid confusion
Modified: seismo/3D/SPECFEM3D/trunk/DATA/Par_file
===================================================================
--- seismo/3D/SPECFEM3D/trunk/DATA/Par_file 2013-03-13 00:00:35 UTC (rev 21517)
+++ seismo/3D/SPECFEM3D/trunk/DATA/Par_file 2013-03-13 00:23:42 UTC (rev 21518)
@@ -23,7 +23,7 @@
# If you use our internal mesher, the only option is 8-node bricks (27-node elements are not supported)
# CUBIT does not support HEX27 elements either (it can generate them, but they are flat, i.e. identical to HEX8).
# To generate HEX27 elements with curvature properly taken into account, you can use Gmsh http://geuz.org/gmsh/
-NGNOD = 8
+NGNOD = 8
# models:
# available options are:
@@ -35,7 +35,7 @@
MODEL = default
# parameters describing the model
-OCEANS = .false.
+APPROXIMATE_OCEAN_LOAD = .false.
TOPOGRAPHY = .false.
ATTENUATION = .false.
ANISOTROPY = .false.
@@ -55,11 +55,11 @@
ABSORB_INSTEAD_OF_FREE_SURFACE = .false.
# C-PML boundary conditions for a regional simulation
-PML_CONDITIONS = .false.
+PML_CONDITIONS = .false.
# C-PML top surface
PML_INSTEAD_OF_FREE_SURFACE = .false.
-
+
# C-PML thickness min/max
PML_WIDTH_MIN = 10000.0d0
PML_WIDTH_MAX = 25000.0d0
@@ -67,7 +67,7 @@
# C-PML dominant frequency
f0_FOR_PML = 12.7
-# parameters used to rotate C-PML boundary conditions by a given angle (not completed yet)
+# parameters used to rotate C-PML boundary conditions by a given angle (not completed yet)
# ROTATE_PML_ACTIVATE = .false.
# ROTATE_PML_ANGLE = 0.
@@ -112,7 +112,7 @@
# its norm is ignored and the norm of the force used is the factor force source times the source time function.
USE_FORCE_POINT_SOURCE = .false.
-# set to true to use a Ricker source time function instead of the source time functions set by default
+# set to true to use a Ricker source time function instead of the source time functions set by default
# to represent a (tilted) FORCESOLUTION force point source or a CMTSOLUTION moment-tensor source.
USE_RICKER_TIME_FUNCTION = .false.
Modified: seismo/3D/SPECFEM3D/trunk/doc/USER_MANUAL/manual_SPECFEM3D_Cartesian.pdf
===================================================================
--- seismo/3D/SPECFEM3D/trunk/doc/USER_MANUAL/manual_SPECFEM3D_Cartesian.pdf 2013-03-13 00:00:35 UTC (rev 21517)
+++ seismo/3D/SPECFEM3D/trunk/doc/USER_MANUAL/manual_SPECFEM3D_Cartesian.pdf 2013-03-13 00:23:42 UTC (rev 21518)
@@ -33553,12 +33553,13 @@
endstream
endobj
274 0 obj <<
-/Length 275
+/Length 277
/Filter /FlateDecode
>>
stream
-xÚu]k0ïýçRaIsòQõ²s::°ª»YwZ» #
hû÷Æ1ÖÑ«CNçMÂà
-<ìF½¯E!`L9* õ 8.©p-2õ^ÂjgE^pÅÂLÛ¡í;m¢×ú $Ò%C ihúÖz¶Ôæ¢?FÐ$ â£ISÉHáLÊî¹B?¸µ9´ÃÙøecº«ð3B¶¶ï/ßß3ÅjåÊ<§ÍqE8§,M p9W¶ÙU[ø²ÞìÖ«?[¢óiÎ5nè˯½°ÚÞ8¦ÉòJû!âtÚÏu8õ4q´P>?u©íáÝ3ònfþ÷}y|E¿r
+xÚuÁj@ï>źÙݨÇÔjIÁ¢öÒô°$¦5
¾}W×RÓ°ã÷ûý®Þ@À£'nÌûÒ[dJP+(O@¸äÒ®T,x$%Gxñmdi.FZøéºoL¼O /#ä1F.PõuçØÜ´ó1Ö¤ -¤5&&SÒ´îI£n»¦=ÔùuǪmÒþgÚ¯»¾¾Ü~/´¨sδǩ#â"¡´¹W²Ù[¸±ÞìÖ«?[¢óiî5>0_{Ö[t*0zÃGË+ísÓÛ~>¸£
+F§Ó|Û¹éïCy7óåø÷ÓÒû
+UrÌ
endstream
endobj
280 0 obj <<
@@ -58866,40 +58867,35 @@
endstream
endobj
1047 0 obj <<
-/Length 3187
+/Length 3172
/Filter /FlateDecode
>>
stream
-xÚÝZYÛÆ~ׯØ7±á©ÊµËÕÒ[KÊËV1 9$Q¥Í¯O÷t.¹ä
öô\Ý=_u±½°.>¼y?óîÚ."3òÿb¾¹À
-/æë_ËÑÝ||?:Â2<s0¾e\ÞGÛ¶ùäöuÍoÆÔ¸Ìæ÷÷Û2>ÏÇWLxÁCkÞ\afãÙàËüw××YÞ¡i¹lNíÀqçÅÛÕOسß4Ô£N DÆN/Ç£ÛYoüñbzÍZ3YÁ}ϨrÚ:¼0/Ô¼fUÔÒ<±72Ý+Ùð;I
-¹8ÂØÈZIù1C¾qVr;#¦R&å>Yñ+Ê68ñûÀ;ù!ÞW
-ór×é¦X2_òâq%×DYÆ¥nÖ
-'º¶iùáÅжÍH:Ú¢ëûF|Õ¾%{U!ãj/³
-ÿ
-c«ºT³boÑóGTz£ª\íxªlMcæØYäûÑq,ËY~óEhÌwIIlX¨.xY"â%ñí ³2AñjÁ`ç&åµÔѬþ¡²z/d§ /2²( Î4oÉyµ#<>+YìKj*-Ó^îóâh
üWÅÂ\ê°Èvy÷§Hö`CC4JgTlxI¸¤îZêB§«S'#$ùZ
-ðicJ¶ÞîÒ":=¶Lime1ÂÀ=Y1ªqpZâêÍOf]{l×@'kåÁ¾qصï@|¥,ÔQyJ:«0²W¯âßpqF·óøÜ ¼Î*VWg(_wºEƯåÂ¥Qmµ,<óÌ<>Ð8Y36ÐKϧwÓ÷£»Âß3Ñ`
-éÛ³Ö¦=Ë541ÏP[Øj%Û³mìtyS¶ëÁÝõô:->Æ© ^¯["âFNB ^<ÂAjm0üÀ8=shj?7±çÂ]p¥ ù¶;¿Ú=Ú´2×L'ðú¦²+Å»ºVØb%½ÂJ ª©¥®<ö0VIa¥j9AïÑ>°,ÌI¹%AìÍÚ`kÒ
-®Cr´ÓRH`º®QæîðÌÜÅînÇåí¸°Ïz¹àZUeÁÁ:Íe±zWîâB®ßXÒM»Ñ*è]ÃW~â´&0UeÚ¡+8P ä
-1Àx0Q¼ä}bq|MÒ)Uº*Bþ i$v} :Ô!Ù-|ÓGb¡@¾Ü½#xüh>ß~Í'ÓÛ§@"°ÌÀýDØg/xÁmÍ(ðz ÌWÌjícàXÍ
-N%6xv£å§pÔÍu%ÙV£)A§Ýáh3@¢±]% ܶàF,pÕ¾ÿtÁûÉ6Sh6ðè*VãÝkÉ1ýÝ(ÆLdtLH·MCm°$7ð8a7ÝM\ סy"ØNF²ÀIILGQÏ)Çq tÙQ½¥6CñhÔQT@£nÁ¦ âRºD~6![²?¤J¬pÅ´áiºF9lÊaeLO!æS§)ó4Y«»ëØÆ]ªG
{x¹UíbeÖ®¶Ïøé0¤ÇH@)$Ð4_%UBöãr¤åy]Pk¯eÊn¹¤¦èQÈ,d¶â47øC>
@æ+!Øñ¬v1H§ÍwÀzÓzáãißlxNEä`*hÀ'ÉOºù(0}/Ò׺/µ¸_ïÇ·ãx`{B
.²Þê¡öB@êz!ø{ÖÁǾPöFà¯A%íðj<zÆ
-Áx?|¡ÌMxm<ò4v¦¸ý ot;Mç÷Ó»WxÝ»£è%¹dà¹=è Éxë¬]GQkuãìõ3)ó
-Dd &ukÐÆè½¥À[JId@9«uÇÅp¢ Õµ¹¬§Ó³Ý)ð÷ ZÄiú(ò´ò
c:ÛUþVfFÈÅ:®â¥J2N>4
-DkuÅQF éU¡òXeG é°ûP¹©JËÑáñËglËFÛýÀ`>ýÄÉÃân4¿yÊÀ"®|³û«F@`´ßcòdµ#_i¬gì{)H%!àj ó©ðÚ$hÔ%9{`$é\Fsgj% ã¢âõA&RA5¥A\:
-Ö¡ñÖ0QÞÅÊámiÑsïs"!ljýósÙ'GûEU÷ö½ßFßÑÆ8650èM¬e' g^~Ó³ñíâ
á íZ¦°í>¦ F
mÉKa
-LØ8¤¦ SÈJâ
èÇè6Ø+¦ÇA=
:òîN2>ªfQ@èã=µû!äOrÝQ5ëVÙÓ´ÙwX¿`ÃûCR´{!ÓÎMF«#´ÓCyßþáXr¿ü1
?RöâOªÜl³ç+u&·00
-YvnôO=ÚßR·ªºõ[G(È×
-;¡4+ð (ÙS¨£ÿ¤FïgÓû÷ÛËéíÕeõdåÖIëönëB¡ðÉËÿ¼ÇõlÓõ»«òlQVË4~¨òl8Î I)+êe^,9"Ïcá;A;ësTìm%íê$A§YBô¿-ö °2(SÅáO)`1¹ÍÇ£«Åôzq}?/fï¯GGUEè®õUYbuF®p_¢ {ÀIX_TO¯'s wdÿz2o ¾Cj¹ã¦ðÜã ¤àìQêb¢5Y&ùb©S
-uª®$PÌ^¤ÐXóhZS´¹1g¯Õàݧ/¼<<ûmðL
-³¬3
-óMO<ÿÚóL¯çÂpFRÅ7CØ&3ºÊ².Åþ1=
-åË·À (e²¯ ¼ ©=ïU»°²[CÊ7
-¼¨ï»'ÒnøiãhÒWÖ\ÑhìpÀ
-øúõ¥aÔɹR¾oº¤¡à¬Dä½DC44â¢PXCØìjÈ?ÒPÐ ëdùê:)J×Äé~Y¡ØGAþÿÀuúûäj~³ø4y2H³õ,:¥þÁ󻸮vyü[3Ë6ûUWwó`üä!.vhlpE'(*Ù·SW ãß x(û²Ñ·àÉdñLâB'<'Ñ?þÒ¿ý?H¯ýÆZ\Oï8ÍÝH¯wÈuÔXg¥ýsÆÜÉoÔñ±<*¬´Én®ê´ÜþßDfxTÍ}¼»¡®lþF»É_Úã¾þá×s ÅÑãO£»ç¿àêqõ=E=JâþóP
-{/.pF,d«WÞª""i¶ãâïðßâë'ßHLirÕÈmAöÔN
ó(ûø@
-U
-(''`ñ èkn
-8Á=9ÄBißw§P±R©ßuáò¬Ò©Ò
-BÊ<ãWקF÷wÞRT¡]½A~§ü4ýiò"ßØç«lm¹ÇÜÄÑ6öÎ5ÚÐ1ê,%dhKnâdÉÍo,9b"ísÇï WÑ î§êS4ãO9òÍjÁ3©ª§udpVß²ÏF°"YÞÑëÐÖ¥kh!6ªuBÖ.«1KªaGÔÕ¡®h×xdaÊACO[¦!¡éPÊ+ÐÓþh¤aÔO:1ðñVþDå¨ß|¡Å^ö¿«@àì¾j_÷§Mu ó6±AÛG%ÂËy®Ï¾¿¶6/Û¨ýv!d¯4»ó7Toôð,_©iQ¦ú{SXÇ¥BàûzéË$L.¬Dǯ4 YÕáåNn"Vî)|Tõ¶,Ϻ Ç,wm1At~ü"^Ð*ª¶($×[íp¿o¾ô!ð9»/$4ÖFGyø£ ´k§¾_Ïßü&GCe
+xÚÝZYã¶~ß_1o¦âx¤*ÚÍ®âj¤uìZo) ±L
+¯'¿>ÝèsØyI^Dl4îÆ×d]<\XÞ¼_¼ywíù±Ø\ÎEàõÅãòãh¶ß
+°Ï
owãÑÀ¶mc1¹ý@ÇÔ¸Ìw÷Û2>/ÆWÜ9ð,"×½¸ÂÍÇóÁ×Åßß]{^gzO¦å°8µÇE7/W?aÍ~gÐP:tº4v4ÝMÜãåôr<º]~®zü&·]ßôÂPO>ì
+*§¨Cì ekZ³*jiÚeº¢alãVRCn06rÅSåùJÆYÉí¥LÊ]²¢o(íxàXÆo[<l_äûøa ¸JaÛ¼N×Ô¾¸Ö¡¦ëÁÓ6#!xÙ*/öyW©Ç¸KjÚF½Wì _,ayý°
M]ñð{²4¬*d\ídVÑ÷uR®ê²Ôü¨~@ËÈaTR«-³Êh|·'Ú/e9÷_Á*ÝÀ7Û¤T;²ú{ÙÀ´u!È2DQý¾Y üµäðã¦PUGVïd¬â^÷²(÷ ¯ÎÀ·¡gYÆ}^mõô¬d±ã9Q±Èt'wyñH}
üWÅÂTj³Ø¸}fÉìêpgjÇC×ó:ÂVªÆ®d`úëjUJê¢'ì"É×L¢Öæ¹RbúHEOÍFi=Èb ÙÆYy°á#þ.Y
+öv½ØcÆÁ'6ºßõï@À{Y¨Ý1 ?³¼¢Fÿ,eÆß38ªÒÈë¬zKoLùm«[dÞÐøŲ\8J½òÌ< > 9YG6ôaRØt6ýp7}üù)ò=3
+þO´/ÔéÃ2P[ØÓJ¶gÐxs½lX¡øzóXy.h¦3^\©'ÒuÌ òEJW¡ß°Æsm
Á°ÕÓ-3rÝç9@ÖÅ`}å÷Ê÷ùCï· (ZWk
+Vª{'«¿5
+í{IO@: `Ímá®O :1%2;;4âjk±õD+8U¬Ð¤ÃæXn'¬fnOHÏßê;Zz8>)ëû5ÀتB`;,ÌÀieY¬ÞÛ¸ëwÏÎ¥-LÄÇ~â´&ÓÊ´Ó¯À@ÙgL64Ð E(Õ÷q<(¾%iÊJîjQÙã¸fè¿¢¼D':~_w²Ü¾$ïh±ß~-&ÓÛ§P"°ÌÀý@EØgazAð¢Cx½@8ÆU%³Z°ÆâËJؽu`£³4¨,É´;í) mXÄçy#Z¨ì.)V±-Ó "V£êõ"£L2u`V`ÒÊ)ç
Ü[dÜó^7Ê¡ S7y¦È°MQÍ[tÆÚ ²ÀÏÎõ<Ä')RpÀÜu2Ö 1ù
+Þ$D>'Ü ÍíûÝ8_¿ØQ½¥6DñWjoÔV ÓB.XF]%ø¾¡ä¡ìö©¥%hÃlºjØ$TÃâÈ:.¸?
H+>éÔË<MÖêÀ:¶1KQõ¨p-·ªm¬ÌÚÕÖà?îÔ LÆrHMóUR%d?.
Ñðù1¯jíòµLypÁìÿïÔ=
+¹
ÌV<bæ¯8äqà«w°`3D³ÚÆ!Ú4/è±õÂc¶oOÌSu4 ¡ä'ý|¾5~¾
åÆZÞ¯ÇwãÛËñ)Oï »h@Èz³Úë@W×ëÀëY¯± )ñJçãxÞ¡ób+<zÆùÀx?|¡ózµqÊ3Øvàö#¼Ñíd>]ÜMg¯ð»ÿ,vGÑóÐçö ñ:CÌÚyToNtÄ~&e^AÞäD¤N
+Úxµ§hK)@ÿ¼Ö³\¯ñéãRÍen"ëÄn"Çôì cw Ŧ"O+_8¦¹]å?È3¹\ÇU|¯òA.´ÑZ]qàê!£*(EK< MÝJ7´LU¶þ·_>c[6Úèé
+gËÙhññ) ´÷Õ_5£õø»è$*Ãö<}¤¡ïz(tZKCÀ©ðSá(´I:ШKrö@H.ò¹LEC]ÖJÐ1çIÉ>2ê=¸t&¬}ã),gCërïUæ/¶¥EÏ_çiÅ@aSëË&89X/ªº·^èÐëmtø½4Ʊ©@/b-«8=cìðú ðó²°Oóñíò
á
+°í>¦ F
^ÐÃ`Ø8¤¦xa
+ô¦àÄÚKôãGtìQÌãK ÈBYwÌGE.
+}<§v? |I®;¢fÝ*{2ûlXr·O:{!ÓÎIF«#´ÓCyþáXr¿þ1
){y'UîLú{¾XkpÓeçA·øEû[ú¬*UÐ{DÖ
+ÒµBÁPxPEO
+ì)DÔ?ÑFR£÷óéÝûÉíååôöj²?)&`"Ú:.&Ï<$ Ï{\Ï6]¿¦*ï`²ì¹LãÇ*Ïã²¢ñ}÷ÊæcXá#hgpb_[I»:Ijã\Y¾ñwJ§]ìNÑT1eøS
+XNnçñèj9½^^ßÇËùç»ëÅgUz¦kE}U«\á¾DA[°W@¤hézhWæÐÝ9¼õdÞºl+ÜëR at h
+Ï=B
+Î¥®!&Ze? :eØP§0©êJ2ÅìE
+5GluLÑæƽV³O/<<<û~?Ru-ëüu^râµñ¼Rr$
Y|rày9eâUEÔUup@,ö¿ØéQ(_þ
+º §Lv5 5¬ÑxOuzJ»5ä¡|¢Àú¾{"íVÆ 1(}eÍÆö{,¯__Fü#åû¦ÛVqYCç/¬ÄÊ° !ßë)äÈâ¢ô°°ÙÕ ¡ @ÇInO]§óe
f`Û}
+ü§L®7'´Ð1[Ïò¡Szè/¸ª¡áöªm^$ÿÖáÌ}ýêëfñ`|5r@;4pE'(û*Ùµ¬+ñ¯<}ÙèSMðd²x&q¡Îè§ÿtâßÿ¤ÃÇ~c-¯§wKdóâA7ÒëmrCo¬³Ò~I)cþÈånÔñ±<(¬´Én®ê´Üþ+¤ÉáA5gôiöqº^6²ù=f¿´Û}ý1ÿ, ?~ßf/Ï ÁÕ7,ãê=Õ{
+*Äýç¡4º=¨XÈV×GWÈÂoù>ò&Þÿâ_]ûFbJL¸@¨F>dÏØÛ©p>RÏ.ÞSCUgÊáùBA_+pjÀ ò
ÆBi]±v»EÄS¨X©ÔÏ:pyVéTi!eQéýäèþÊÛUhWWȯõ7Ó'/ò=@y¾ÊÖ{ÌMÍh3lëlX£
+£ÎRB¶ä&NÜüÆ2"¦®]òø-á*` :ÿðÎÿð@S9üG@¾YM¸e"Uµà´Ìöê[öÙC$Ë;¸¾ m]ºb£öNOÛÐe5&I5¬òºÚ×àzÆ¥ëìnk4@5¨¶czç4úIÛ:^(¿këld^²+á[vDÍîÝT{Ù>6¥ÎýaµGõÁ¿y®/~_[H¶ jÿ¹²Ë>»óªë<ÜË7úÈ´(DSß{aâ)¬Ã:!Ð}O_éßJü? EÇ÷aÐÌêðt'+ßUåB}»¶åYÿsÕÉrÛVrqIç·îöÐ TQµ!¹~ÐÞö{lT Þg÷6B= tyE ];<õ/·ñâÍ MO'
endstream
endobj
1062 0 obj <<
@@ -61152,31 +61148,40 @@
/Type /ObjStm
/N 100
/First 1014
-/Length 3449
+/Length 3453
/Filter /FlateDecode
>>
stream
-xÚÍ[mS9þίз
-Z½¿^¥¶
-Âd/$TàìnR©ÏoÇ56쯿§eØ06v\W$¶F£zº[ÝÏ#ÉJjÉ$SR+¦L f:*Dfe¢cÖQëj¨EÁ²ä©Æh|$jmñ¡ßB¡.ó]ËJxÊ£ð"=FÃ&EÏÈ´t$
IL«DCXÉ´¡¤ULÛ@O@íe¤µù®a:FÍFf¤¢1¬C)÷!rù®eÆhÒfl s¨óÚ9<\¾ëÆ@Þ%¨DùüDbVgù¼aÖê7ìX>vÎÞ2ë=K5é CÚä©ã¤4[èÃeÅIPJ4B²u¤Ð¥³d]³$g0
´Ú[9²>ZÅ@£§È<ºÜʦñÚ£¥¨¤7::RJ¥s;ÇUy¬ÄBȶ
D&PtÙ¶2j1FWlhY´!?áXôÙѳÉbé¡ÀÍ/!P¢BI³¤HÛ
-¯öTò,Ù$·PB;óÝÈR#¢D/f/ʺÍØ\²uÈáTvè@£[Ñû+_]SÞ±Èa¦ÞñEŬ¿,
WB>úp¨@HUp¹H
¦gã¸- b.bt(³EÑ-CÖ&KFBkcs[MEò%_GY2L
-û%7@Ô;½Ú»ê$s[tfÐlëÙ³-qümP2±ÓïW£-qty2Êׯ»ý¿·ÄnUwÊúOò³x)^ç¸P¸ØïÊÓûS;ÉĤÒGÉ4ÈÀµrh·Ã=câÕqÅÄ{rÚ|ï~TÛì_¶ðï1¨|ÑbãóGÛÈ=üØÆÀ=|C»ÄíQYãÖ'öëwxPä8ygò¶nbçºURð}ì±?15=zÇÄÇßÿÀdêNMýË^ïsÓp¿êr¯ûS+?±¨Ãäñ}DÉ4¾@ÐÒ±iwZ59¤|
ÞÅa]x-&÷ö8.¿ØçYMgåx!ÊþhH-Ðó¤auYÃqÎue§[ìV_YÖ¡Ç|´ZOS at UãYÿC³É³Ì¸`ô¤`SSÓ´17m\SðM!4
ØÇl
-jRp757cøüX?¹;q÷ÕH
-<AãÆÁQXGcæOWǵÔ'«øë¬Èw7éV̼µyIl2Ü*Ê^D¹¾ä¢¦µXÖ'HrÂÁ@â²Õ2,Ò,7VmNeÁ½Ä#^6.H0<`5h)9rçrH]¬/¸*¸HÄ´$"p$ò È ôÆüló#<&«s·bÌ°XyQ~Å(¼âf¬<5H~ &bòÚùyÛÛ+vkiÖGàºÎjÈRÄ&Åp¾K ×&X9ðÏ&EIkÀ@+Y¨|YéÅ7ª§1sü }«
-÷Hø®Æ[ØX4Á?ÀµRÌcZT6hi¸CÛ ³¡Ìà ªarâNÉÉ.$ë{pÑþ`¸øhLèõ}Lèåã1¡m`k»©ikkkK«a¹b~7l ¸CͱâùQ£;p_Yn³» ;òøhAæÍ'u«â{àÅN*r_k,àÜNAüxò.ùUÄγgy ±ÇGâ?ï^Ñÿ'×××|PÔÅU·¼æU}¶½.Õ8TJÙ&ÞÆ?,câCY#OUÈJ´°d5r&ñD@q!Ñ뤩DáªGh-),RN«uÏ.륯1üèßÝ_ óËáÖ(Fr£u 9dîHÖZäÕb0(ûîW¾s/{õÿSKþ ºÞ¯3 ¦¼fÃG0¡e,òM">&s°äÄ)ì:ça¦ó!ªÓ¢¨«¦¼¬é¸×záL5÷]">ì÷*
h
YJ¨-Á·ÀQY¬q}ÖÓk[,,MTÄ~`±e_YÜð7úñíÉI$Á«¼~íÝb7F;xîîîZVÂ
-+M¡Yë fîLÙPÅH»<XK
h,r_èHv¬á¸fÊ!µ!n´í¸ïKÊò;¼¨zÕÙ7~^ÔWEÝáeçrû¿¤Ï4i´ç³3þ7ã¦3¼èì}wJzwjc³åÅØxZlðklBilðklðk³Þë\5{òâð5{q^
-GÃÓº;±È½ÙÆ;ÕeA6Ü+F%{²÷/-eZEx*ÕORþvUç¡&ÇÝQ
-^V½Þ·ëªê|y~pÌËÁ°¥;ê¤d¯z½ËᨦªOOÞ}ÚfÑfçrtNM²û°×ÅÉö¬~ý:zq4ðÆ6ª/˹÷ß0ÕÜÝ-evñâèÍo¿½|ú¾¬;E¿»Î^9VÎ{YÙ2ãé6uëáè9<þ´%^0ô-ñ¡ÛDZ²ýÏf¾±ìOÑn7ãCöñ_ÌËh#MÓZùù=Iô®Aa8TöæÊX.úNa\G[>¯¢[ Mz¶è'FEÛeoþµZuºý3%ôwúÃnS1õH-fxÿaïýîáÓç9ݲn3[Þ*NÁËyªh>gKËüoï¹sÛâ~ïí´Õ/½½¾¥ö1f¹Õñ Æ&yS\ísf7G7Èð³EDÄ~¯8fûìO)Ö¡¿¼,»g縴A½ß£g·Ä«QÑëîôÏ:póhT^¼gº8è;Ûvkq÷ã¤çqA槸ýD<{âWäµq(E!NÄ©èRü%ÎĹ8ÿ68/û¢+zâBôE%¢C1§¥Kq%®Å·íñíw{%ÁHê²:jsè[)Ad ¼7ѹѪ§uä¢Ò££ÐÃÕD=´sP|¾VÖ°Å´öƺ{
-í½
þ>ß¡ÁS¤ï~Öa~ü«{
âÛtÚïöK(¶Âç@ʺ[uÄ !~¬èò
-Mݯ7*×%¾¯«¬üʺº«ýp_ûfÑÖóHÛÌ´7ÌC®0i¯)µN6oÀ[m¤ånÅ¢mp
-ÆØ5äs¨[ªÜYó6ûñ.<mµ:¸¡
gÞ`ÓÝ¡i_ñVÓQí¸ç$$ÝàNíQ9° _ì´@õØåî©ø£È«O1æcIï:jÛ²»æ¡e
-W:nÐ?hÏfà>Dá Þ%yé¼3
!Áã-0¡ÉÎ %¿õzý?«®Ä°8½KYM7$ªèÁD»XÁçódÉ?@QøÚ>uöcÜ/&ô$D°+1/¥î3/bªf^±a^©a^i¼èä׸ dSPËÓ+ZéÒ29%©¬ùã.±º{sB©ÎËáðËÕð˨î¾\TDÆÔé.úï/þØóêéÁ7Òùù]uQô[¼J$RZÍ'R&ãeÿ\l«rÙ4¿O§
µÓÒ~3Õ8LQm&ä)SË' %!ªeèdHCÞlP?ϵÆ~þ¬³1 OÐêÚ[NêètyÑ骢+ucÂr³ ü ñÏFá³ ü. ×rxçèr¨¦E5`>"»Q(9i¸
-2É^q\§¸Æ3´¬FP&i9Ý w at qTâ#7pm 2è´q &óß³±"&Î'Ê\Ñ
¼¥N1N¯c/³>9òA6@>I;}ù´:´`Ûl¨
-0 #Áª¢Aõw!@Âtz)p1Ó¶µ¼Ï2\ÌÅ@uɹ{p¢Aääq5¡ïoÐ9¥£
-çÿé4o öÓÁðºF ø´=íÿF6uñÊMa{¹õÒìzÉåùJÑkçß~äóp¡ÓöÀöÓ2^»<´o¬}h ~¦É0xx^ªáy5`ïËz!XàòÖw_½}sôå¤@ÿR~ôn¿ Ëå}Å,h¦*Ä|H´³EǬ×ç+-.A¿Ð+Ûâö;]bx(«Ö¹q¨é#R©7H¡,N9NÖ=rtÔî¥k}*ay=Ê
-^Ý·K+Xa²s¦lh
-±)4ô¯9à¯\Ã'oK?åi
-=9åoj\Shh©Éá²5ý>ÀzËÖ8¾9/I?KÜ.ZIûP¼,ÓÍ®ñÿ fÆg
+xÚÍ[mS9þίзZ½¿^¥¶
+Âd/$TàìnR©ÏoÇ56쯿§e±alìpîÑôH=Ýî§%YI-dJjÅ Dh¦!"2+YG<Ö3µÑ
+²äÙh¦¤{h·Ðf¨Ë|×2åuað·(ÏT(h|i"ÓÒÑ&1Éc%Ó¥ULÛ@O@í¤µù®a:F
+Ý©hë@åþ¼bF¹|×2cHKc&
+m>¿«ÃÁå»h Mc8¨DùüDbVgùðúÖÒ«J/Aeù<ø' ¼eÖ'zÖ{f£!ð%O|P¦Òm¡'iÀPFP¶4DtVLP¦s¤`"L!=#þ`3õÀ"óÒ'¼CJÌk0ÃH.AiæÎAGpP¥3cÁª<Vb!fÛFÉBÊ^2Û6jøÊ&ÛbDóEm=Á|x©ó;&ÇT I;¸i[)Ãò,Ù¤·@ÏÇ|7²È Urì|1ûNÖmÙQ¨5eÍê)9à*ûc¢ü˯nÌ=F¼z©É1ñAdÖ_ÍZj k*gé¯!® ©ß,qp$®¨ß,ióÒ2µ-ÄÓ:8äÚdÉÈñµqWòðèA»,&DÊýZz,ÄÓQ/¼Réßlc
+[Ïmão~¿m£ËQ¾~Ýíÿµ%v«ºSÖPdÅKñJ<Ç
ÂÅxWØÚIN*7Úóè1Yæ0&pøvسgL1ñ¢:®ØcON»£ïý½Ójýüóþ?D/AlpÜcþh¹Û89v;Ú9/£²ÆlNí=×0NtxPä8¹Cò¶nbçºURð9}ì±?
ÉÞ1ññ·ß1!YºÂRÿ²×ûÜ0îWýQîui?±7Öaòø>¢A_ héØ°Á#È&9¤|
ÞÅa]x-&÷ö8.¿ØçyMgåx!ÊþhH5Ðó¤auYÃqÎme§[ìV_YÖ¡Ç|
+IC-E§i¦ª1cÖÿç,Còä,3&65-
+ò¸ð
+"6Dó¸
+¡&¶LÇñù¡~2?qLÂ>Y q5äA:Y<qþU×R¬ã±óØ©48ex®þ$Ã)Á\p(ÛÁÛ1t9µ\6'Hr¹Â!tXÌVóDËU'B4÷ SA<béåÑ ä~*#{®&ÔÅæ«DLII"B`"
+EùæGyç¸s7bÌ°\Eq~ÍÌâh¬<5H&bòÚÅyÛÛ+vki6' 04·Ñ$pVCz|IlR\é[9`õ4X9Þc× kÐ
+¡5Høe¥GT¥8CåO Ñ7J1 JHù\Îa#@Û÷4U[)æcZT 6hi¸C{AæC Qm`'°S ìÒH¹¾íF
^ßE
^>Úè¹ú¹iKý\ý\ý\ý\Z͵Øó{æ`CÀ¥j×ÌÝ¡úuå6{°0±ÆƲh>©PÅçW¤"÷µÆòMBüxò.ùUÄγgy ±ÇGâßï^Ñïëëk>(êâª[^óª>ÛÞjJTJÙ&ÞÄ?,0~f6X©*d%Z°¥r^ ØÁhB½ÉB
+c¸*áZf&G
+
Z§U?»guÉÒ7þôï¦bÀW èüjb¸
+Üh¥'hNë`;u ¹`ý Ê~§ûïÜ Ã^ý¿áÔÃÃðo®÷¨)¯Ú0çLh|
+Xrâvs0SùÕ «&¹×zéL5w]"ÞïwB´Â,%Ôà˹pDÖ¨H6¸BD+êÁµ-E&*b?°Ø²¯,nø©£~|{òÒ'IðêBå5r·ÜÁÏݽ×CËZSXc)4«=ÁlÒ)ªi_G k©B¡2¹À/u$»NNÖp\3åZ¨ n´í©pßewxQõª³oü¼¨¯ºÃËÎåö-/~E/ci´\ä³sþ7ç¦s¼èì]wJz
+wjc³ÆØxZlðklBilðklðkóÞë\5{òâð5{q^
+GÃÓº;±È½ÙÆ;ÕeA6Ü+F%{²÷O-eZRðTªHùðTûX»£^V½Þ·ëªê|y~pÌËÁ°¥;ê¤d¯z½Ëᨦ¦OOÞ}ÚfÁ³s9:'£ì>ìuq²=o_¾^ ¼qêËráý·L5wwaD¼8zóë¯/¾/ëNÑ/Æ®³W¡ónV¶Ì¸Cº
+¦n=='öÄëbr
+}K|èvFçdÁq¬lÿ±¹ÞXõǧÈ&7ãCöñOÌKËà¦áV~qO½ Ö 0?©D{Cse,}¦0nóÈ¥>¯£[ MzÒÀÕé'FEÛeoþ¥Zuºý3%ôwúÃnÓ0õH-fxÿaïýîáÓç9ݲn3[Ý*ÎÁËEªhþÎS«ü¶÷Öܹá¸Û{»míËGoooi}Ynt|c±IÞeûÙÍÑ
+2ü¤¥gÑ'ä$±ß+ÎÙ>;ÃSuhÆä//ËîÙ9.DP/Ç÷èÙ-ñjTôº§;ý3Ü<ï¢.ºÃ!äζEd¸ûqÒó¸ óSÜ~"=ñòÚ8Ç¢'âTtD)þgâ\}Ñ=q!ú¢Q¡ÓRÄ¥¸×âÛöøÍö»½`¤ÌuUµ9ôÍ 2P^ÇèÈLuæY¹èftgè(&ôp5Q'í_g¯fÕçgµl1«½±î^C{o¡¿â7hðé»u&ÿì^A¡xÁ6ö»ýðw eÝ:b?VtyÖa÷ëTå£óºÄçuÿwYW·µîjÿÁU´õ<ÒF3í
+óж«E Lå«fJm²7¨[m¤ånÅiwÝ ª·&°kÈç*n½RåÖ·1Ü÷ái³ÕéÀéÌ1¨lú¡;4í+ÞÊr:¹ w¨9 ¦dq§ö¨ª ì´DÍØåö¹ø£DWbÌ8 ßuÔ¶ew"ÌCË %lbN\éøþA;x6÷±$n â][ûË!w¦0$êxLh²sB ¨ÆßWõzý?«®Ä°8½]%³b4ËH¥>¢s!ÕÅ*|Ê'ü=åв~®l9ý1_Ü//èó6»Vå¥ÔÝÊ*ÕW^±©¼RSy¥IåEg¿Æ
+¡V/¯\h-¯SÊßoV·oNJª³âr8ür5ü2ª»Á/UçVãÒév
uÞ_ý¾ÿæÕÓo¥óÓ»ê¢è· xXHiµ¸2¬úãb[kóÅMû´yZX8-íW 8SÃÕfR<åOjqù¤DáD§î¡!Mñfúè|¡5&ðó'9LG^VSüio :©¢Óå
+D§«v®Ô- ËÍòÆ(> ÏðÛ \Ëu à£È¡Õù¨Ø¥BÁÌIÃUXIöã:Å
+Á e5:2ÄHËé é#rGÅI!>ò|ø5dÐyã Læ¿gcMLì%÷Þeð]È[êcéHðj9ö2#¤w@>I;}ù¼:´`{4Ø*tÂOJ¿f ãÐ+9FÚÖò>G.i£àb! ªKÎÝ-µÇ¸Ðw·èËJBQÏ#çÿÙ4g öÓÁðºF ø´=íÿB6uñÊ
+±½Úziö ½âòü£RôÚùÛùüá#8OÐ!öÉQàûiAFoÜGî[7ÖÞ·?ÇrW£jx^
+Øû²b¸¼q«£ããWoß}9)Æ¿_½¢Û/'Èru_1«YF
Ov¶è õæ|¥Å%ò÷0Ö,<lKØïtÂCYµÉCMGJ½A
+u¨âãtlÝ#§H·ük
+éNê°æÁ§V·Ñ¬àÕ]+¸´&;gÊ
+ÑÍåÊpò¶J5gÊTs¦Lùikfæp.ÛÐ7¬·ÊGÑ71gð!éË`Ûe+ieîÿêGÆ
endstream
endobj
1178 0 obj <<
@@ -75477,8 +75482,8 @@
endobj
1698 0 obj <<
/Author()/Title()/Subject()/Creator(LaTeX with hyperref package)/Producer(pdfTeX-1.40.13)/Keywords()
-/CreationDate (D:20130304165639+01'00')
-/ModDate (D:20130304165639+01'00')
+/CreationDate (D:20130313012147+01'00')
+/ModDate (D:20130313012147+01'00')
/Trapped /False
/PTEX.Fullbanner (This is pdfTeX, Version 3.1415926-2.4-1.40.13 (TeX Live 2012/Debian) kpathsea version 6.1.0)
>> endobj
@@ -75529,43 +75534,57 @@
/W [1 3 1]
/Root 1697 0 R
/Info 1698 0 R
-/ID [<1426629257CF939999DF61321FEC70DD> <1426629257CF939999DF61321FEC70DD>]
+/ID [<B990D3DCB1D7E9799E5982D44994BD72> <B990D3DCB1D7E9799E5982D44994BD72>]
/Length 4202
/Filter /FlateDecode
>>
stream
-xÚ%{pgy÷ÕíXwÛ²d]lÙ².dÉÉGïIG7KÖ]kÉÖJ² )$MÖ´¡`Å(2mH5ÇD¶ç4Sj?ùÖ366¡Ó[~mÚ¶ÃvS:Pf ÝçåGûþvÏÝïý½ßÙï]9Nö³d9N#SÿÉJöe9yn!¬X³Ñ
-³AÚ´|Â\DÛB [ÐFÐ4ÔÐ. åê¡£é©A ÚZa)Ø6¦±
-lG»EXv é-,'ûé=háNPv(Ö:®Vj´y´Â°í2Ú2ánPåä$Ñ÷½hÑ<Â:°/Öü´EÂzÐVv
°4¡íE»L¸4£E[ lhsÇ<áÐvía;8vÍ%<£G#<:ÐÑf ;ÁQ´!´Â$èBB&ì=hÓhSÇÀq4rÔ1IxD#G§Ài4mð8kQÚEÂsà<ZÚa/èCëD%ì)´´`mp£¥Ð uÇ4|Ú¡èIÇÐ.¢
-ê£éèéõf&ÑtR:Óhz¿zi:ñäzYh} ÚêÐÛÒäÍ£é'ÔÄ_FËGÓ!QÓ,¢ %TÃ-¡¢épªYWÐÐNbôÀþÜrØQÌòP)AEÒq*rÐÐÈe@
yhL Ç ©î`Z>(ö ¾¾ÜÌU´B=¯%×èá¡bJÐêк)ö`+þ(ö`;('ïM8ØoÔ-J2¨»øUì Ô~P¨ø TSöçñwp Æãÿu$«²$Æ~;ÆÃWÉ.ü#}û¹ÔÄáßÆÚ~ã§;ãñ«ïÑ¢ÿf½ãQ¤ ì½Òÿói^ç^4½*=Ø'ýÿòÛzp{w±EÅÍ:ZÕ´j:8¨äà0 ~@ÕG¢®»æC¥ÔÔjÎqDU<`® ×Ø1À§pvåj+ >ª1 &éÿáÞè¼Á´P3ÕP)óA@}Ì U0çÔBÀ,PóZïf ·Ìm0?±¹d¯eêØéÿÿTMëm¤¹æ< ù "PJ@)Ø
-¶í ì å ì
-T°ìµ`/¨û@=h ìÍ m ÀaptNptnÐãà8 NÓà8Îó ô~`p1p 0 ¦À4³`¸àà2¸À2XWy8Ñ'<$³O#É\À3H2xòHæ7
§d1àÙ"Y
-x¢Hn<G$Ë OÉrPvJPªA
-ØvZ°ìu`¨
- 4ý ´Vp ´vpAèGAtnp'ÀIp
-gÀYp`ÍtôÿâG:ºj-`hI0L1éà=ÌíÁ1fþó p[)¶ö ¿j'Ø:Íb0QÀUæ,èvs`
-LIpãÐ6ÆÀZ/ØØ©`jÕ`'¨ùª]ç1£Wu#|âÐKüeÊÁ°Ô~Æ2
< ®rᶸL=áq``LI0¦ÁsÀÀ<X ~Ç"ðÀX+²äÜRQ²¥,Åd)&K1YÉRLb²¥,Åd)&K1YÉRLb²Ô¥,ud©#KYêÈRG:²Ô¥,ud©#KYêÈRG:²Ô¥,ud©#KYêÈRG:²Ô¥,ud©#m-Åd)&K1YÉRLb²=²T¥¢,e©(KEY*ÊRQ²Tí} ¤ Uf©2KY2mÉ´%ÓL[2mÉ´%ÓL[2mÉ´%ÓL[2mÉ´%ÓL[2mÉ´%ÓL[2mÉ´%ÓL[2mÉtH¦C2êÔö
-Õ4ñL¥v%ÞEy4ÍtãS-q}¸Ó"¦Ê2§»ÖL¤Z¾¯[U è£ßAp´Ã@g3Îb@éföv¹Vq[¯O81Ô%NuC]<âĺFÄ¡®1a¨ëAâÄ'81Ä!NqbCâÄ'81Ä!&1a CLbÂ0Ä!&1a CLbÂë
¹ê|KoOºÌÕÉc7¨LfÀóxFþuÀôQ¹ÉCË0-e0RmClbÛÛØ6Ķ!¶
-±mÑÃNI{G¯
-±rC¬bå+X9ÄÊ!.»%Õ;¬ÓÉm/Ï À £¡4$©_éÁø>ÄÙá¤ÿJ5,NIê£ÿ !¦'%õÄ75Ä÷áNÔqñsÌ~y#udéñ=ó¸=¼$ãjÔB¸(×sä©ÿiSMÍ¿$×
-ÿTÃeμ}.ÈÙÀku<²g?-@«dõõVÕ
-A1(ù G®OüL÷&ÀP*×?\äȳ¿qÏqìO|ã÷Á'Á§À
-°
-7Á§Áx¬ÇÈ-üómÛAØÊ64ô>´Q´yQ´e±4:P ×/ÏéåÖ"°ìûåÆ×to3hà híàØ'7ÒzðAp±ª@¿²4FÐ $èÝ §ÁptÈGô;´µ¡·pç@/8)7þì±w¤@ÜøVjýrãïþY·æ<pÈo¿¡{/0À0À(Á8 `
-LY-¯pduòíîT+
-1VÞñáÅxúñ;1ñɶ7~ãæßǸEøÂxÊc¼üÝ_צ«_ס«w¢é?ñê÷S1þ_½£73À2XWiN9@@È Ã!²úhJѦ8+믪¶BPA ([Á6°ì å
-ì¹²úÖWô| ñm:é' «A
-Øvm·íÚd£«¨ÕwÒSÕY}ÿo4l- ^VôÕè¯%ö MnÖ¼§;V¹Yتa; ±8hg%N XSÖUâ8+k_øwýØ ·½à°ÜÜ>ª{Ïqz´³G ·D§ÜløBÏ-¡·O§-Ñ-kÏ|ÞµOÌè^:O ÚTQ at s*1údí3=zÈEÐh
%À ¬ýQ6zô³²öh3>iðP?1&eía4[;h9&¦ M¬ÄàÊÚ÷õp\ó²öÎ#ëÃMº×Ë`QÖ/Ô©¶°Oèc=ëùÙ äèãDGøØÌÇf>6óÕH+²>õ==®ó±£á|çc8_#.ɬßÕãpëüJ }Ìåc.¿ËúS ã5ùxÍÇk>¾òµ¥|íÑâ+¿AÖOÑÇR¾6jñ¯X<äksùÚv%ç¾6[µÚ*ë7¨'Ð>¦.`q¯ùݲþâÛºW[¬¸Î×)®óiú8Ì?)ëwÖõ¸sìûdßÇ~¬gu/fð±}ü1YÿÆ#/Ì,è^ãcKù¤ÖÇþ¬?|M¡ËéÏyyéö#/_îwÄÿÈ»º[ø+ at 3MÎ}W^ºõ¦îÕƹ¸ý¢Üþåùâg#¯Á9oDêe¹ý¾¨¦?¤6Â/Q.a«¤ÕðKDB£Ü)ªÔØ'Â>öðKÄ,1KE&Â4¹à°©*Â4¦0Mi¢j¾[Dur§öCñ/{n?ÑÅ $ã|À^,ÑÝðK_",í;ÿ¥_"üa¤v~s"áÃEØ'ÂQÜiù¦#w¾ïÈFûý}z*,íY
-A¢Ã²qî
-1\×"ì%ecøuÝÑ
-Ü"&·ÃELn¶ßOËÆt×"m¿ãµEçdcö«º×Dzáòñä¯ïMûè²áý·ÌöÌG%Ýþªi[}LHº+O5m¡c®h`½È818,bâ0WÄ$a¸5¶§3ÓHäIúÔ¤_ýKÝâùÔciîåIzú_UÓõfoØ<<zþði¯GÀceãÑ5ðhhxÚäàÝcùïJÚ[Ò3×2.ºÚÃ@WþØKGÄÓå?«,ß<¯NÒO~V?Û
-<FgñÚK(e×,éü
ÌbÊÓ²Êòèxº`ëô3´,¼Iü±jÚ¬9XÄyúaHÒ¾«{õru\â|ùEÕ¸£vIÿ £ËÃm~í§2tÎiô7Q ~Ü®Ì'þT£ñ o.2,)}Ì¢¤ß-ÖCè
-ÅÅæóvaa²$ýýçTcUdtf` ©5þÅ_ë^V&!é^Cº3&<ÃzËHúçÏë^²jèû}û77hðÁ¦\î>¡cA1ÄTËÝÕº·FîVæ:r·÷É/~\5oöÈÝ{s0r÷k¿Tei»¯ézÚ02mZd³w«îÀ G6ÙÑa7XÅ`7¾Ñ±7²9ý=«¼aº ¦1tóÞ0äÒЪ3¬ÔÍ)Ù\þº~¦aÍih
:YÆ¡¡fèZÍߪÐá?C-Ìe¨ÃÖÐõ3¬÷
->0ã²ù©Ëú .\Çæ¡ághßÁ¡=aèÿ¦aMlpÁÔ_|eÔWj¤«²yûçúVÆ_}õèsl~ëMÝÊÍÿûne˽êÝÊ{£õº+÷®·èVÜ{%[ ¹÷õïêÖ¹÷½êV¾Üß}]·
-äþS¿Ö
-åþ/ëVÜ¿ß[ÅrÿßÚt«Dy [¥òà7uk+еæRßêãÂQyð:tË4·x.ï]^*»|Ìݶ~z]:;n9`
æî,ØÜ*Àï[x}æîLd®¾0ç´ËÛ9w¨¼·r¯Ýý·ánh@h¼ÊsyÙîrG®þû wärG.o¹]ý÷^!ºÝ·¹.k?÷Øî p§ÁpðíònÛíú_¼úuy×ë Þr»¼rie»ú ú£`ðÂ×ÕÿDÀî$à
¯;-ÌwbÓ¼]àü?°Vü
+xÚ%{P×}Ç÷ÇëJ<
$ÄK¼H ÐH ô ®Ä[B¬@ª¦vÒÎTm8¢2ÁN3vµcÑ+I½É¤O=J<v&Çñxô¾ÆätiIñN3Û¤3q¦w?¿üóaß³wïî9ßß¹{~ÇÉ~ü,ÇÉrÄqJâ?YÉá,'Ï-@ka6Z>a6ÈAëBÛIòÐh;`Ú8zr>ÚE´<Bý¢B´)4½T(FGË!,»ÐÐô6JÁn´«hY{À^´54}2°/ËÉ~¬Í!,hGbû:a%¨B[B[#¬ûÑÑV k at mhA»FXêÑ:Ñ<Âp Öüb´ÂFÐVv°D«G[&<ZС]!lmhôs÷áaÐvm°t¢Ds £hçÐ.vn´Q´ÂpíÚ<aGE#ì}hsh³'ÀI4ƨ{° 1FÝÓ§À 6Exµ(íáYpmp£õ MZÚEÂó`mmðCK¡jÃE4|Ú§èE'Ñ.¡ê
+M¡ièåõafдRÚshú¼zkÚqäzYhÃ: .¹Õ¥·¦}pP~m'vf-í¡îZv§u
+m£ü÷§h`<2%ÈB#IºÉ² í c¡A@÷IB²;Øv
+${ß_næ:Z!ÉÄ÷kôðP@²Åh
+hÇ Iö`&þHö`7Ø#NÞßÄA]|Ô©G¤dPöó ²,ØÈý` ã
+P)Î7â ¯ó|7ÿ׬âòݯ¼ìHvÁ;ÿéKzå*Pÿkÿùn_Çý×8£9þÄÈ¡í¿õÃ#ýiÔËÈOóºµ;ëÑô®Höàüè¦ÜDë~Èø çA »v at NLò7èdmph_i'jïj·ëxè@éêÐêã «x(À\®°cOàì ËäV@~dc@
+eäÇi}2%Ðyi3 g²; SæüA²"`Î È
Y* æµ ßÌn;<0Û8;`~bsÉ*?_«Ô±ã2ò³«¦ùv at R¹ $ÀN
+@!(Å ì¥`7Øö2°
+P ª@5Øj at -¨
+à hM @hA;è à8
+º@7èÇÀqÐúÀ pôp
+Óà8Î!0F@
+£àÁÀ3`Ìy° .,%p,«`xàXkà:/'ú"÷d6àm$xI& oÉ÷dà-#Yx·H Þ(¥÷äÀÛC²ìå T*P
+öPê@=h @#hÍà 8Z at +hA;è à8
+ºA8à8è'ÀIÐÀ)0N3à,8ÎQpèHçÈȯÿK{W-°Ô6c$vNècn¿N0ó#û9Jqt TýUëçh#ÅÂl& ?T3 Ú 8.Y0fÀ"ç`mLi´!°ÐÙGjU Tª}_ÄÞÕEPºøÄi ·6
+øË:P ?cN>®rãíqxL#áU:q`LK`
+L0æÀ<X Á¸~Ç
+ðÀ5°
+Ö esKFY2ÊLd²$%,ÉdI&K2YÉLd²$%,ÉdI&K2YÉG<²ä%,ydÉ#KYòÈG<²ä%,ydÉ#KYòÈG<²ä%,ydÉ#KYòÈG<²ä%,¶µ$%,ÉdI&K2YÉö2ÊQ²d%£,eÉ(KFY2ÊQvd%Ë,YfiËH[FÚ2Ò¶´e¤-#miËH[FÚ2Ò¶´e¤-#miËH[FÚ2Ò¶´e¤-#miËHtÈH:c¦$µ;<S©ÝK7aQ^M3½øTS\_î4ɲÌ) É®9s\R?Ö£JÐ
+ôÕ¯íà(зáL §3{@ u3@ÜØ÷¢Þ.-qb¨Jê2'ºxÄ!&u C]bÂP×81Ä!NqbCâÄ'81Ä!Nqb CLbÂ0Ä!&1a CLbÂ0Ä!Ös%ÕècáÉP¹:yÔZÀäi¼gôí_;L_Å<´ÓR#
Ø6Ķ!¶
+±mmClbÛÛ=ìÔïé!V±rC¬bå+X9ÄÅa¯¤.êÇtr[åËsA°"Èèmè
+]Ô£'ãûgZù{Õ°|8+©ßyGCLÎHê×5Ä÷áe¨ý¼$Sý,|1ß+ÓÏ:ríÍ=ó¸=\©·T#¹Ñò¤#þ¢S55ÿ5¹Qðe
+W¹r9+ú\²#7Jè»c¥¬½]µPÁN#7§ßÓÖØJäæâÕÄã¿ýÀqìãà ðIp¬?·Á`|
+lÆÈ-øëÝ`ØÊ4ô9´Q ´xQ
+´dQ/7õvkA!ØêÁ!¹õÈ#ÚÚZA8ÚAèäÖôäNp¾ª û~e#hÍ Ipô>p
+Ó tË]úZÚÐG8 γ`È׿¡ç)0,·¾Ý¢ÚÜúéÑeà\çåÖwÿF[Á0
+.10. 0 .)0
+fÀ,ó²^VáÈúL¼<\wçc\=c-^w¯è½mÅø½å¿ßãñË1è±îĸýv§?3ãÙx¹¹þÜb</Æçþ5Æ_ÄH¿ãåOǸ?ãK4üåéÃ,k`¬ë§ äÈáY8¯§hQWÏÍçTÛòA(E ] ì{A¨å WÖÿáKz½}`'Ø÷é¤$¬Õ`?¨Zn«Zd£ª¨õ·=½ThõÿùÍ 4ÊúOþ]5êkCà0hÛÕÿ¤
+G@Ü.¨Ñ°PØJ ³ý"Vâ t8
+ÎÈÆóV?vP[J!pTnï>£gy@}ÊY.@á-Ñ#·nè)ÔÜúøTÚ½²ñ±
+G6>>ªT©âTbËÆÓõK`P
+K£²y_=zÙxøÙø¢Á¶~â2W
+5¤ØÚMÉ11(b%®W6¾ù¼r,E°$o
+;²9V©X+²yq¯j× Öó }¬çc=?ä\}èãùØÌÇf¾iM6g¿£WÁu>vô1á|çë{Ä¢ÜÉú¨Ã|\çW Lèc.sù L6]×ñÏùxÍÇk>¾òµ¥|Ñâ+¿I6ÿèÏõcXÊ×B-¾òµ|-Àb._Ë®¹¯ÅV¤¶Éæmu¯uL]ÀÐã>^ó{eóoj«Xq¯S\çS&õq? wÐóÎFßgô}èËf¦N[1}|ìãOÊækñOêgæg´çøÄÇR>Cëã
+\6_yIO¡ÊéÏ%yö
AG[pÄÿÈ[Ú-ü5 #Íû®<ûÔÚª
sMqíûyáýçùÜÓ¯9òbpJ¤Àú`U^~¥þ3´~r Û$=öÚ"ü1 QBîhö°O}"ü1KEÌR¦0M¤WÞpXÄTaÓD&Â4Qß-¢¹S»ÿ²çò]c8δb©ê~_"üah¿ÜÙ÷½5üá#Eó#áçD.Â>vjåNëW¹óÊÏÙ긣§_/
E£zÙêÐ$:*[gÑÃEx-Â>QR¶Æ¾ª
+½É-br0\Ääiù}P¶æÊô<¼iù¯Ex(:+[×V¶ºõÆÇdëÿy6£Ê÷S
+#OHºCgÛHËê+`ZÒÉ÷UÓ:æ Ö\£%Ã"&sEL2Xc{:Ã1D¤O}MCô˯ëï§Ks/OÒs都ë*Ì^)Ø
+<<jþði
+G
ÀceãQ5ð(hxZäàÝcùïHÚ»¬W®¥_tµs]ù¦§ËVY¿y^¤?ü¤~¶0x,<®âu PË*¯EÒù+=ŧeåQñtÁÖ#é}COIJ^¤ÿà¯UÓbÍIÀ"ÎÓm~Ò×V½]í¸'ÛPíOÔ!éÓdtyX*é/¼«!]ázfI¿öjÁèôMªQÊÉ\ñÀ¿u[5ª8°saIa¨ûdV$ývBUÈ8²ý©ABC¹È°Ö0Yþ?TUÑ0Éô¯ÿV[YU¤ßÕò¡:cvÏ°Þ2ÅþÕ'´Q5Ô}î>à
+üað)»%Wõdb0Á *¹[^ªÕñÑÿ9rwÈñÌcª1ð¦NîÞÓá18ÇàÓ,w_ý¥j,ûLÜýÂ÷5¤'
+.1´ií¡6`#L»lk·¬b°ÁF÷g4¤ïMlÏÝÓó°Áæ8À4jÁ±4ê+usJ¶WÿB?FÑΰæ4Â,CaËPP3Ô%CÁÀíß-Òá?C.ÌeÈÃÖPõ3¬÷
+>0S²ýÉYýÄ47®}OqÀPð3ï`CAÍP0ÔÿE CÑΰ&68Ì`j¯¾2ê+5ÒuÙ~áçº+ãÈWÏžz¸©¡Èö·ßУ,Ù~ïz-÷ªõ(GîMTéQ®Ü»Y¯GyrïÅÏêQBî}ù{z´Cî}MvÊýGõ(_î?ú@î?µG
rÿ~§Éý6êQ±<8½¥G%òà£uz´èÚJÇRwAõuá<ø:tËFË.˳˦²ËÇÜR°ðÓëRÙqË +4·°`s+¿on5`ûÌLd®n³+í²;ç }+·°5èì»
+í °ç²ÙîòD®þû OäòD.»Ü®þû [n/`7×eíç²íöp
+ÓààÛeoÛú_lýºìõºç»Ü.ÛS.¥lWÿ1AÿaL6|]ýOLèÎ 6|Ý9y`âåÜïóÿikU8
endstream
endobj
startxref
-10537994
+10537985
%%EOF
Modified: seismo/3D/SPECFEM3D/trunk/doc/USER_MANUAL/manual_SPECFEM3D_Cartesian.tex
===================================================================
--- seismo/3D/SPECFEM3D/trunk/doc/USER_MANUAL/manual_SPECFEM3D_Cartesian.tex 2013-03-13 00:00:35 UTC (rev 21517)
+++ seismo/3D/SPECFEM3D/trunk/doc/USER_MANUAL/manual_SPECFEM3D_Cartesian.tex 2013-03-13 00:23:42 UTC (rev 21518)
@@ -1075,15 +1075,14 @@
\end{description}
%
%
-\item [{\texttt{OCEANS}}] Set to \texttt{.true.} if the effect of the oceans
+\item [{\texttt{APPROXIMATE\_OCEAN\_LOAD}}] Set to \texttt{.true.} if the effect of the oceans
on seismic wave propagation should be incorporated based upon the
-approximate treatment discussed in \citet{KoTr02b}. This feature
+(rough) approximate treatment discussed in \citet{KoTr02b}. This feature
is inexpensive from a numerical perspective, both in terms of memory
requirements and CPU time. This approximation is accurate at periods
of roughly 20~s and longer. At shorter periods the effect of water
-phases/reverberations is not taken into account, even when the flag
-is on.
-\item [{\texttt{TOPOGRAPHY}}] This feature is only effective if \texttt{OCEANS} is set to \texttt{.true.}.
+phases/reverberations is not taken into account, even when the flag is on.
+\item [{\texttt{TOPOGRAPHY}}] This feature is only effective if \texttt{APPROXIMATE\_OCEAN\_LOAD} is set to \texttt{.true.}.
Set to \texttt{.true.} if topography and
bathymetry should be read in based upon the topography file specified in the main
constants file \texttt{constants.h} found in subdirectory \texttt{src/shared/} to evaluate
Modified: seismo/3D/SPECFEM3D/trunk/examples/BENCHMARK_CLAERBOUT_ADJOINT/ACOUSTIC/DATA/Par_file
===================================================================
--- seismo/3D/SPECFEM3D/trunk/examples/BENCHMARK_CLAERBOUT_ADJOINT/ACOUSTIC/DATA/Par_file 2013-03-13 00:00:35 UTC (rev 21517)
+++ seismo/3D/SPECFEM3D/trunk/examples/BENCHMARK_CLAERBOUT_ADJOINT/ACOUSTIC/DATA/Par_file 2013-03-13 00:23:42 UTC (rev 21518)
@@ -23,7 +23,7 @@
# If you use our internal mesher, the only option is 8-node bricks (27-node elements are not supported)
# CUBIT does not support HEX27 elements either (it can generate them, but they are flat, i.e. identical to HEX8).
# To generate HEX27 elements with curvature properly taken into account, you can use Gmsh http://geuz.org/gmsh/
-NGNOD = 8
+NGNOD = 8
# models:
# available options are:
@@ -35,7 +35,7 @@
MODEL = default
# parameters describing the model
-OCEANS = .false.
+APPROXIMATE_OCEAN_LOAD = .false.
TOPOGRAPHY = .false.
ATTENUATION = .false.
ANISOTROPY = .false.
@@ -55,7 +55,7 @@
ABSORB_INSTEAD_OF_FREE_SURFACE = .false.
# C-PML boundary conditions for a regional simulation
-PML_CONDITIONS = .false.
+PML_CONDITIONS = .false.
# C-PML top surface
PML_INSTEAD_OF_FREE_SURFACE = .false.
@@ -67,7 +67,7 @@
# C-PML dominant frequency
f0_FOR_PML = 12.7
-# parameters used to rotate C-PML boundary conditions by a given angle (not completed yet)
+# parameters used to rotate C-PML boundary conditions by a given angle (not completed yet)
# ROTATE_PML_ACTIVATE = .false.
# ROTATE_PML_ANGLE = 0.
@@ -97,7 +97,7 @@
# interval in time steps for reading adjoint traces
# 0 = read the whole adjoint sources at the same time
-NTSTEP_BETWEEN_READ_ADJSRC = 0
+NTSTEP_BETWEEN_READ_ADJSRC = 0
# use a (tilted) FORCESOLUTION force point source (or several) instead of a CMTSOLUTION moment-tensor source.
# This can be useful e.g. for oil industry foothills simulations or asteroid simulations
@@ -112,7 +112,7 @@
# its norm is ignored and the norm of the force used is the factor force source times the source time function.
USE_FORCE_POINT_SOURCE = .false.
-# set to true to use a Ricker source time function instead of the source time functions set by default
+# set to true to use a Ricker source time function instead of the source time functions set by default
# to represent a (tilted) FORCESOLUTION force point source or a CMTSOLUTION moment-tensor source.
USE_RICKER_TIME_FUNCTION = .false.
Modified: seismo/3D/SPECFEM3D/trunk/examples/BENCHMARK_CLAERBOUT_ADJOINT/ELASTIC/DATA/Par_file
===================================================================
--- seismo/3D/SPECFEM3D/trunk/examples/BENCHMARK_CLAERBOUT_ADJOINT/ELASTIC/DATA/Par_file 2013-03-13 00:00:35 UTC (rev 21517)
+++ seismo/3D/SPECFEM3D/trunk/examples/BENCHMARK_CLAERBOUT_ADJOINT/ELASTIC/DATA/Par_file 2013-03-13 00:23:42 UTC (rev 21518)
@@ -23,7 +23,7 @@
# If you use our internal mesher, the only option is 8-node bricks (27-node elements are not supported)
# CUBIT does not support HEX27 elements either (it can generate them, but they are flat, i.e. identical to HEX8).
# To generate HEX27 elements with curvature properly taken into account, you can use Gmsh http://geuz.org/gmsh/
-NGNOD = 8
+NGNOD = 8
# models:
# available options are:
@@ -35,7 +35,7 @@
MODEL = default
# parameters describing the model
-OCEANS = .false.
+APPROXIMATE_OCEAN_LOAD = .false.
TOPOGRAPHY = .false.
ATTENUATION = .false.
ANISOTROPY = .false.
@@ -55,7 +55,7 @@
ABSORB_INSTEAD_OF_FREE_SURFACE = .false.
# C-PML boundary conditions for a regional simulation
-PML_CONDITIONS = .false.
+PML_CONDITIONS = .false.
# C-PML top surface
PML_INSTEAD_OF_FREE_SURFACE = .false.
@@ -67,7 +67,7 @@
# C-PML dominant frequency
f0_FOR_PML = 12.7
-# parameters used to rotate C-PML boundary conditions by a given angle (not completed yet)
+# parameters used to rotate C-PML boundary conditions by a given angle (not completed yet)
# ROTATE_PML_ACTIVATE = .false.
# ROTATE_PML_ANGLE = 0.
@@ -97,7 +97,7 @@
# interval in time steps for reading adjoint traces
# 0 = read the whole adjoint sources at the same time
-NTSTEP_BETWEEN_READ_ADJSRC = 0
+NTSTEP_BETWEEN_READ_ADJSRC = 0
# use a (tilted) FORCESOLUTION force point source (or several) instead of a CMTSOLUTION moment-tensor source.
# This can be useful e.g. for oil industry foothills simulations or asteroid simulations
@@ -112,7 +112,7 @@
# its norm is ignored and the norm of the force used is the factor force source times the source time function.
USE_FORCE_POINT_SOURCE = .false.
-# set to true to use a Ricker source time function instead of the source time functions set by default
+# set to true to use a Ricker source time function instead of the source time functions set by default
# to represent a (tilted) FORCESOLUTION force point source or a CMTSOLUTION moment-tensor source.
USE_RICKER_TIME_FUNCTION = .false.
Modified: seismo/3D/SPECFEM3D/trunk/examples/CPML/HOMO8_FREE_SURFACE/DATA/Par_file
===================================================================
--- seismo/3D/SPECFEM3D/trunk/examples/CPML/HOMO8_FREE_SURFACE/DATA/Par_file 2013-03-13 00:00:35 UTC (rev 21517)
+++ seismo/3D/SPECFEM3D/trunk/examples/CPML/HOMO8_FREE_SURFACE/DATA/Par_file 2013-03-13 00:23:42 UTC (rev 21518)
@@ -23,7 +23,7 @@
# If you use our internal mesher, the only option is 8-node bricks (27-node elements are not supported)
# CUBIT does not support HEX27 elements either (it can generate them, but they are flat, i.e. identical to HEX8).
# To generate HEX27 elements with curvature properly taken into account, you can use Gmsh http://geuz.org/gmsh/
-NGNOD = 8
+NGNOD = 8
# models:
# available options are:
@@ -35,7 +35,7 @@
MODEL = default
# parameters describing the model
-OCEANS = .false.
+APPROXIMATE_OCEAN_LOAD = .false.
TOPOGRAPHY = .false.
ATTENUATION = .false.
ANISOTROPY = .false.
@@ -55,7 +55,7 @@
ABSORB_INSTEAD_OF_FREE_SURFACE = .false.
# C-PML boundary conditions for a regional simulation
-PML_CONDITIONS = .true.
+PML_CONDITIONS = .true.
# C-PML top surface
PML_INSTEAD_OF_FREE_SURFACE = .false.
@@ -67,7 +67,7 @@
# C-PML dominant frequency
f0_FOR_PML = 12.7
-# parameters used to rotate C-PML boundary conditions by a given angle (not completed yet)
+# parameters used to rotate C-PML boundary conditions by a given angle (not completed yet)
# ROTATE_PML_ACTIVATE = .false.
# ROTATE_PML_ANGLE = 0.
@@ -112,7 +112,7 @@
# its norm is ignored and the norm of the force used is the factor force source times the source time function.
USE_FORCE_POINT_SOURCE = .false.
-# set to true to use a Ricker source time function instead of the source time functions set by default
+# set to true to use a Ricker source time function instead of the source time functions set by default
# to represent a (tilted) FORCESOLUTION force point source or a CMTSOLUTION moment-tensor source.
USE_RICKER_TIME_FUNCTION = .false.
Modified: seismo/3D/SPECFEM3D/trunk/examples/CPML/HOMO8_NOFREESURFACE/DATA/Par_file
===================================================================
--- seismo/3D/SPECFEM3D/trunk/examples/CPML/HOMO8_NOFREESURFACE/DATA/Par_file 2013-03-13 00:00:35 UTC (rev 21517)
+++ seismo/3D/SPECFEM3D/trunk/examples/CPML/HOMO8_NOFREESURFACE/DATA/Par_file 2013-03-13 00:23:42 UTC (rev 21518)
@@ -23,7 +23,7 @@
# If you use our internal mesher, the only option is 8-node bricks (27-node elements are not supported)
# CUBIT does not support HEX27 elements either (it can generate them, but they are flat, i.e. identical to HEX8).
# To generate HEX27 elements with curvature properly taken into account, you can use Gmsh http://geuz.org/gmsh/
-NGNOD = 8
+NGNOD = 8
# models:
# available options are:
@@ -35,7 +35,7 @@
MODEL = default
# parameters describing the model
-OCEANS = .false.
+APPROXIMATE_OCEAN_LOAD = .false.
TOPOGRAPHY = .false.
ATTENUATION = .false.
ANISOTROPY = .false.
@@ -55,7 +55,7 @@
ABSORB_INSTEAD_OF_FREE_SURFACE = .false.
# C-PML boundary conditions for a regional simulation
-PML_CONDITIONS = .true.
+PML_CONDITIONS = .true.
# C-PML top surface
PML_INSTEAD_OF_FREE_SURFACE = .true.
@@ -67,7 +67,7 @@
# C-PML dominant frequency
f0_FOR_PML = 12.7
-# parameters used to rotate C-PML boundary conditions by a given angle (not completed yet)
+# parameters used to rotate C-PML boundary conditions by a given angle (not completed yet)
# ROTATE_PML_ACTIVATE = .false.
# ROTATE_PML_ANGLE = 0.
@@ -112,7 +112,7 @@
# its norm is ignored and the norm of the force used is the factor force source times the source time function.
USE_FORCE_POINT_SOURCE = .false.
-# set to true to use a Ricker source time function instead of the source time functions set by default
+# set to true to use a Ricker source time function instead of the source time functions set by default
# to represent a (tilted) FORCESOLUTION force point source or a CMTSOLUTION moment-tensor source.
USE_RICKER_TIME_FUNCTION = .false.
Modified: seismo/3D/SPECFEM3D/trunk/examples/Mount_StHelens/DATA/Par_file
===================================================================
--- seismo/3D/SPECFEM3D/trunk/examples/Mount_StHelens/DATA/Par_file 2013-03-13 00:00:35 UTC (rev 21517)
+++ seismo/3D/SPECFEM3D/trunk/examples/Mount_StHelens/DATA/Par_file 2013-03-13 00:23:42 UTC (rev 21518)
@@ -23,7 +23,7 @@
# If you use our internal mesher, the only option is 8-node bricks (27-node elements are not supported)
# CUBIT does not support HEX27 elements either (it can generate them, but they are flat, i.e. identical to HEX8).
# To generate HEX27 elements with curvature properly taken into account, you can use Gmsh http://geuz.org/gmsh/
-NGNOD = 8
+NGNOD = 8
# models:
# available options are:
@@ -35,7 +35,7 @@
MODEL = default
# parameters describing the model
-OCEANS = .false.
+APPROXIMATE_OCEAN_LOAD = .false.
TOPOGRAPHY = .false.
ATTENUATION = .false.
ANISOTROPY = .false.
@@ -55,7 +55,7 @@
ABSORB_INSTEAD_OF_FREE_SURFACE = .false.
# C-PML boundary conditions for a regional simulation
-PML_CONDITIONS = .false.
+PML_CONDITIONS = .false.
# C-PML top surface
PML_INSTEAD_OF_FREE_SURFACE = .false.
@@ -67,7 +67,7 @@
# C-PML dominant frequency
f0_FOR_PML = 12.7
-# parameters used to rotate C-PML boundary conditions by a given angle (not completed yet)
+# parameters used to rotate C-PML boundary conditions by a given angle (not completed yet)
# ROTATE_PML_ACTIVATE = .false.
# ROTATE_PML_ANGLE = 0.
@@ -97,7 +97,7 @@
# interval in time steps for reading adjoint traces
# 0 = read the whole adjoint sources at the same time
-NTSTEP_BETWEEN_READ_ADJSRC = 0
+NTSTEP_BETWEEN_READ_ADJSRC = 0
# use a (tilted) FORCESOLUTION force point source (or several) instead of a CMTSOLUTION moment-tensor source.
# This can be useful e.g. for oil industry foothills simulations or asteroid simulations
@@ -112,7 +112,7 @@
# its norm is ignored and the norm of the force used is the factor force source times the source time function.
USE_FORCE_POINT_SOURCE = .false.
-# set to true to use a Ricker source time function instead of the source time functions set by default
+# set to true to use a Ricker source time function instead of the source time functions set by default
# to represent a (tilted) FORCESOLUTION force point source or a CMTSOLUTION moment-tensor source.
USE_RICKER_TIME_FUNCTION = .false.
Modified: seismo/3D/SPECFEM3D/trunk/examples/homogeneous_halfspace_HEX27/DATA/Par_file
===================================================================
--- seismo/3D/SPECFEM3D/trunk/examples/homogeneous_halfspace_HEX27/DATA/Par_file 2013-03-13 00:00:35 UTC (rev 21517)
+++ seismo/3D/SPECFEM3D/trunk/examples/homogeneous_halfspace_HEX27/DATA/Par_file 2013-03-13 00:23:42 UTC (rev 21518)
@@ -23,7 +23,7 @@
# If you use our internal mesher, the only option is 8-node bricks (27-node elements are not supported)
# CUBIT does not support HEX27 elements either (it can generate them, but they are flat, i.e. identical to HEX8).
# To generate HEX27 elements with curvature properly taken into account, you can use Gmsh http://geuz.org/gmsh/
-NGNOD = 27
+NGNOD = 27
# models:
# available options are:
@@ -35,7 +35,7 @@
MODEL = default
# parameters describing the model
-OCEANS = .false.
+APPROXIMATE_OCEAN_LOAD = .false.
TOPOGRAPHY = .false.
ATTENUATION = .false.
ANISOTROPY = .false.
@@ -55,7 +55,7 @@
ABSORB_INSTEAD_OF_FREE_SURFACE = .false.
# C-PML boundary conditions for a regional simulation
-PML_CONDITIONS = .false.
+PML_CONDITIONS = .false.
# C-PML top surface
PML_INSTEAD_OF_FREE_SURFACE = .false.
@@ -67,7 +67,7 @@
# C-PML dominant frequency
f0_FOR_PML = 12.7
-# parameters used to rotate C-PML boundary conditions by a given angle (not completed yet)
+# parameters used to rotate C-PML boundary conditions by a given angle (not completed yet)
# ROTATE_PML_ACTIVATE = .false.
# ROTATE_PML_ANGLE = 0.
@@ -112,7 +112,7 @@
# its norm is ignored and the norm of the force used is the factor force source times the source time function.
USE_FORCE_POINT_SOURCE = .false.
-# set to true to use a Ricker source time function instead of the source time functions set by default
+# set to true to use a Ricker source time function instead of the source time functions set by default
# to represent a (tilted) FORCESOLUTION force point source or a CMTSOLUTION moment-tensor source.
USE_RICKER_TIME_FUNCTION = .false.
Modified: seismo/3D/SPECFEM3D/trunk/examples/homogeneous_halfspace_HEX8/DATA/Par_file
===================================================================
--- seismo/3D/SPECFEM3D/trunk/examples/homogeneous_halfspace_HEX8/DATA/Par_file 2013-03-13 00:00:35 UTC (rev 21517)
+++ seismo/3D/SPECFEM3D/trunk/examples/homogeneous_halfspace_HEX8/DATA/Par_file 2013-03-13 00:23:42 UTC (rev 21518)
@@ -23,7 +23,7 @@
# If you use our internal mesher, the only option is 8-node bricks (27-node elements are not supported)
# CUBIT does not support HEX27 elements either (it can generate them, but they are flat, i.e. identical to HEX8).
# To generate HEX27 elements with curvature properly taken into account, you can use Gmsh http://geuz.org/gmsh/
-NGNOD = 8
+NGNOD = 8
# models:
# available options are:
@@ -35,7 +35,7 @@
MODEL = default
# parameters describing the model
-OCEANS = .false.
+APPROXIMATE_OCEAN_LOAD = .false.
TOPOGRAPHY = .false.
ATTENUATION = .false.
ANISOTROPY = .false.
@@ -55,7 +55,7 @@
ABSORB_INSTEAD_OF_FREE_SURFACE = .false.
# C-PML boundary conditions for a regional simulation
-PML_CONDITIONS = .false.
+PML_CONDITIONS = .false.
# C-PML top surface
PML_INSTEAD_OF_FREE_SURFACE = .false.
@@ -67,7 +67,7 @@
# C-PML dominant frequency
f0_FOR_PML = 12.7
-# parameters used to rotate C-PML boundary conditions by a given angle (not completed yet)
+# parameters used to rotate C-PML boundary conditions by a given angle (not completed yet)
# ROTATE_PML_ACTIVATE = .false.
# ROTATE_PML_ANGLE = 0.
@@ -112,7 +112,7 @@
# its norm is ignored and the norm of the force used is the factor force source times the source time function.
USE_FORCE_POINT_SOURCE = .false.
-# set to true to use a Ricker source time function instead of the source time functions set by default
+# set to true to use a Ricker source time function instead of the source time functions set by default
# to represent a (tilted) FORCESOLUTION force point source or a CMTSOLUTION moment-tensor source.
USE_RICKER_TIME_FUNCTION = .false.
Modified: seismo/3D/SPECFEM3D/trunk/examples/homogeneous_poroelastic/DATA/Par_file
===================================================================
--- seismo/3D/SPECFEM3D/trunk/examples/homogeneous_poroelastic/DATA/Par_file 2013-03-13 00:00:35 UTC (rev 21517)
+++ seismo/3D/SPECFEM3D/trunk/examples/homogeneous_poroelastic/DATA/Par_file 2013-03-13 00:23:42 UTC (rev 21518)
@@ -23,7 +23,7 @@
# If you use our internal mesher, the only option is 8-node bricks (27-node elements are not supported)
# CUBIT does not support HEX27 elements either (it can generate them, but they are flat, i.e. identical to HEX8).
# To generate HEX27 elements with curvature properly taken into account, you can use Gmsh http://geuz.org/gmsh/
-NGNOD = 8
+NGNOD = 8
# models:
# available options are:
@@ -35,7 +35,7 @@
MODEL = default
# parameters describing the model
-OCEANS = .false.
+APPROXIMATE_OCEAN_LOAD = .false.
TOPOGRAPHY = .false.
ATTENUATION = .false.
ANISOTROPY = .false.
@@ -55,7 +55,7 @@
ABSORB_INSTEAD_OF_FREE_SURFACE = .false.
# C-PML boundary conditions for a regional simulation
-PML_CONDITIONS = .false.
+PML_CONDITIONS = .false.
# C-PML top surface
PML_INSTEAD_OF_FREE_SURFACE = .false.
@@ -67,7 +67,7 @@
# C-PML dominant frequency
f0_FOR_PML = 12.7
-# parameters used to rotate C-PML boundary conditions by a given angle (not completed yet)
+# parameters used to rotate C-PML boundary conditions by a given angle (not completed yet)
# ROTATE_PML_ACTIVATE = .false.
# ROTATE_PML_ANGLE = 0.
@@ -112,7 +112,7 @@
# its norm is ignored and the norm of the force used is the factor force source times the source time function.
USE_FORCE_POINT_SOURCE = .false.
-# set to true to use a Ricker source time function instead of the source time functions set by default
+# set to true to use a Ricker source time function instead of the source time functions set by default
# to represent a (tilted) FORCESOLUTION force point source or a CMTSOLUTION moment-tensor source.
USE_RICKER_TIME_FUNCTION = .false.
Modified: seismo/3D/SPECFEM3D/trunk/examples/layered_halfspace/DATA/Par_file
===================================================================
--- seismo/3D/SPECFEM3D/trunk/examples/layered_halfspace/DATA/Par_file 2013-03-13 00:00:35 UTC (rev 21517)
+++ seismo/3D/SPECFEM3D/trunk/examples/layered_halfspace/DATA/Par_file 2013-03-13 00:23:42 UTC (rev 21518)
@@ -23,7 +23,7 @@
# If you use our internal mesher, the only option is 8-node bricks (27-node elements are not supported)
# CUBIT does not support HEX27 elements either (it can generate them, but they are flat, i.e. identical to HEX8).
# To generate HEX27 elements with curvature properly taken into account, you can use Gmsh http://geuz.org/gmsh/
-NGNOD = 8
+NGNOD = 8
# models:
# available options are:
@@ -35,7 +35,7 @@
MODEL = default
# parameters describing the model
-OCEANS = .false.
+APPROXIMATE_OCEAN_LOAD = .false.
TOPOGRAPHY = .false.
ATTENUATION = .false.
ANISOTROPY = .false.
@@ -55,7 +55,7 @@
ABSORB_INSTEAD_OF_FREE_SURFACE = .false.
# C-PML boundary conditions for a regional simulation
-PML_CONDITIONS = .false.
+PML_CONDITIONS = .false.
# C-PML top surface
PML_INSTEAD_OF_FREE_SURFACE = .false.
@@ -67,7 +67,7 @@
# C-PML dominant frequency
f0_FOR_PML = 12.7
-# parameters used to rotate C-PML boundary conditions by a given angle (not completed yet)
+# parameters used to rotate C-PML boundary conditions by a given angle (not completed yet)
# ROTATE_PML_ACTIVATE = .false.
# ROTATE_PML_ANGLE = 0.
@@ -97,7 +97,7 @@
# interval in time steps for reading adjoint traces
# 0 = read the whole adjoint sources at the same time
-NTSTEP_BETWEEN_READ_ADJSRC = 0
+NTSTEP_BETWEEN_READ_ADJSRC = 0
# use a (tilted) FORCESOLUTION force point source (or several) instead of a CMTSOLUTION moment-tensor source.
# This can be useful e.g. for oil industry foothills simulations or asteroid simulations
@@ -112,7 +112,7 @@
# its norm is ignored and the norm of the force used is the factor force source times the source time function.
USE_FORCE_POINT_SOURCE = .false.
-# set to true to use a Ricker source time function instead of the source time functions set by default
+# set to true to use a Ricker source time function instead of the source time functions set by default
# to represent a (tilted) FORCESOLUTION force point source or a CMTSOLUTION moment-tensor source.
USE_RICKER_TIME_FUNCTION = .false.
Modified: seismo/3D/SPECFEM3D/trunk/examples/meshfem3D_examples/many_interfaces/DATA/Par_file
===================================================================
--- seismo/3D/SPECFEM3D/trunk/examples/meshfem3D_examples/many_interfaces/DATA/Par_file 2013-03-13 00:00:35 UTC (rev 21517)
+++ seismo/3D/SPECFEM3D/trunk/examples/meshfem3D_examples/many_interfaces/DATA/Par_file 2013-03-13 00:23:42 UTC (rev 21518)
@@ -23,7 +23,7 @@
# If you use our internal mesher, the only option is 8-node bricks (27-node elements are not supported)
# CUBIT does not support HEX27 elements either (it can generate them, but they are flat, i.e. identical to HEX8).
# To generate HEX27 elements with curvature properly taken into account, you can use Gmsh http://geuz.org/gmsh/
-NGNOD = 8
+NGNOD = 8
# models:
# available options are:
@@ -35,7 +35,7 @@
MODEL = default
# parameters describing the model
-OCEANS = .false.
+APPROXIMATE_OCEAN_LOAD = .false.
TOPOGRAPHY = .false.
ATTENUATION = .false.
ANISOTROPY = .false.
@@ -55,7 +55,7 @@
ABSORB_INSTEAD_OF_FREE_SURFACE = .false.
# C-PML boundary conditions for a regional simulation
-PML_CONDITIONS = .false.
+PML_CONDITIONS = .false.
# C-PML top surface
PML_INSTEAD_OF_FREE_SURFACE = .false.
@@ -67,7 +67,7 @@
# C-PML dominant frequency
f0_FOR_PML = 12.7
-# parameters used to rotate C-PML boundary conditions by a given angle (not completed yet)
+# parameters used to rotate C-PML boundary conditions by a given angle (not completed yet)
# ROTATE_PML_ACTIVATE = .false.
# ROTATE_PML_ANGLE = 0.
@@ -97,7 +97,7 @@
# interval in time steps for reading adjoint traces
# 0 = read the whole adjoint sources at the same time
-NTSTEP_BETWEEN_READ_ADJSRC = 0
+NTSTEP_BETWEEN_READ_ADJSRC = 0
# use a (tilted) FORCESOLUTION force point source (or several) instead of a CMTSOLUTION moment-tensor source.
# This can be useful e.g. for oil industry foothills simulations or asteroid simulations
@@ -112,7 +112,7 @@
# its norm is ignored and the norm of the force used is the factor force source times the source time function.
USE_FORCE_POINT_SOURCE = .false.
-# set to true to use a Ricker source time function instead of the source time functions set by default
+# set to true to use a Ricker source time function instead of the source time functions set by default
# to represent a (tilted) FORCESOLUTION force point source or a CMTSOLUTION moment-tensor source.
USE_RICKER_TIME_FUNCTION = .false.
Modified: seismo/3D/SPECFEM3D/trunk/examples/meshfem3D_examples/simple_model/DATA/Par_file
===================================================================
--- seismo/3D/SPECFEM3D/trunk/examples/meshfem3D_examples/simple_model/DATA/Par_file 2013-03-13 00:00:35 UTC (rev 21517)
+++ seismo/3D/SPECFEM3D/trunk/examples/meshfem3D_examples/simple_model/DATA/Par_file 2013-03-13 00:23:42 UTC (rev 21518)
@@ -23,7 +23,7 @@
# If you use our internal mesher, the only option is 8-node bricks (27-node elements are not supported)
# CUBIT does not support HEX27 elements either (it can generate them, but they are flat, i.e. identical to HEX8).
# To generate HEX27 elements with curvature properly taken into account, you can use Gmsh http://geuz.org/gmsh/
-NGNOD = 8
+NGNOD = 8
# models:
# available options are:
@@ -35,7 +35,7 @@
MODEL = default
# parameters describing the model
-OCEANS = .false.
+APPROXIMATE_OCEAN_LOAD = .false.
TOPOGRAPHY = .false.
ATTENUATION = .false.
ANISOTROPY = .false.
@@ -55,7 +55,7 @@
ABSORB_INSTEAD_OF_FREE_SURFACE = .false.
# C-PML boundary conditions for a regional simulation
-PML_CONDITIONS = .false.
+PML_CONDITIONS = .false.
# C-PML top surface
PML_INSTEAD_OF_FREE_SURFACE = .false.
@@ -67,7 +67,7 @@
# C-PML dominant frequency
f0_FOR_PML = 12.7
-# parameters used to rotate C-PML boundary conditions by a given angle (not completed yet)
+# parameters used to rotate C-PML boundary conditions by a given angle (not completed yet)
# ROTATE_PML_ACTIVATE = .false.
# ROTATE_PML_ANGLE = 0.
@@ -97,7 +97,7 @@
# interval in time steps for reading adjoint traces
# 0 = read the whole adjoint sources at the same time
-NTSTEP_BETWEEN_READ_ADJSRC = 0
+NTSTEP_BETWEEN_READ_ADJSRC = 0
# use a (tilted) FORCESOLUTION force point source (or several) instead of a CMTSOLUTION moment-tensor source.
# This can be useful e.g. for oil industry foothills simulations or asteroid simulations
@@ -112,7 +112,7 @@
# its norm is ignored and the norm of the force used is the factor force source times the source time function.
USE_FORCE_POINT_SOURCE = .false.
-# set to true to use a Ricker source time function instead of the source time functions set by default
+# set to true to use a Ricker source time function instead of the source time functions set by default
# to represent a (tilted) FORCESOLUTION force point source or a CMTSOLUTION moment-tensor source.
USE_RICKER_TIME_FUNCTION = .false.
Modified: seismo/3D/SPECFEM3D/trunk/examples/meshfem3D_examples/socal1D/DATA/Par_file
===================================================================
--- seismo/3D/SPECFEM3D/trunk/examples/meshfem3D_examples/socal1D/DATA/Par_file 2013-03-13 00:00:35 UTC (rev 21517)
+++ seismo/3D/SPECFEM3D/trunk/examples/meshfem3D_examples/socal1D/DATA/Par_file 2013-03-13 00:23:42 UTC (rev 21518)
@@ -23,7 +23,7 @@
# If you use our internal mesher, the only option is 8-node bricks (27-node elements are not supported)
# CUBIT does not support HEX27 elements either (it can generate them, but they are flat, i.e. identical to HEX8).
# To generate HEX27 elements with curvature properly taken into account, you can use Gmsh http://geuz.org/gmsh/
-NGNOD = 8
+NGNOD = 8
# models:
# available options are:
@@ -35,7 +35,7 @@
MODEL = default
# parameters describing the model
-OCEANS = .false.
+APPROXIMATE_OCEAN_LOAD = .false.
TOPOGRAPHY = .false.
ATTENUATION = .false.
ANISOTROPY = .false.
@@ -55,7 +55,7 @@
ABSORB_INSTEAD_OF_FREE_SURFACE = .false.
# C-PML boundary conditions for a regional simulation
-PML_CONDITIONS = .false.
+PML_CONDITIONS = .false.
# C-PML top surface
PML_INSTEAD_OF_FREE_SURFACE = .false.
@@ -67,7 +67,7 @@
# C-PML dominant frequency
f0_FOR_PML = 12.7
-# parameters used to rotate C-PML boundary conditions by a given angle (not completed yet)
+# parameters used to rotate C-PML boundary conditions by a given angle (not completed yet)
# ROTATE_PML_ACTIVATE = .false.
# ROTATE_PML_ANGLE = 0.
@@ -97,7 +97,7 @@
# interval in time steps for reading adjoint traces
# 0 = read the whole adjoint sources at the same time
-NTSTEP_BETWEEN_READ_ADJSRC = 0
+NTSTEP_BETWEEN_READ_ADJSRC = 0
# use a (tilted) FORCESOLUTION force point source (or several) instead of a CMTSOLUTION moment-tensor source.
# This can be useful e.g. for oil industry foothills simulations or asteroid simulations
@@ -112,7 +112,7 @@
# its norm is ignored and the norm of the force used is the factor force source times the source time function.
USE_FORCE_POINT_SOURCE = .false.
-# set to true to use a Ricker source time function instead of the source time functions set by default
+# set to true to use a Ricker source time function instead of the source time functions set by default
# to represent a (tilted) FORCESOLUTION force point source or a CMTSOLUTION moment-tensor source.
USE_RICKER_TIME_FUNCTION = .false.
Modified: seismo/3D/SPECFEM3D/trunk/examples/meshfem3D_examples/socal1D/example_utm/Par_file_utm
===================================================================
--- seismo/3D/SPECFEM3D/trunk/examples/meshfem3D_examples/socal1D/example_utm/Par_file_utm 2013-03-13 00:00:35 UTC (rev 21517)
+++ seismo/3D/SPECFEM3D/trunk/examples/meshfem3D_examples/socal1D/example_utm/Par_file_utm 2013-03-13 00:23:42 UTC (rev 21518)
@@ -28,7 +28,7 @@
MODEL = default
# parameters describing the model
-OCEANS = .false.
+APPROXIMATE_OCEAN_LOAD = .false.
TOPOGRAPHY = .false.
ATTENUATION = .false.
USE_OLSEN_ATTENUATION = .false.
Modified: seismo/3D/SPECFEM3D/trunk/examples/noise_tomography/DATA/Par_file_step1
===================================================================
--- seismo/3D/SPECFEM3D/trunk/examples/noise_tomography/DATA/Par_file_step1 2013-03-13 00:00:35 UTC (rev 21517)
+++ seismo/3D/SPECFEM3D/trunk/examples/noise_tomography/DATA/Par_file_step1 2013-03-13 00:23:42 UTC (rev 21518)
@@ -29,7 +29,7 @@
MODEL = default
# parameters describing the model
-OCEANS = .false.
+APPROXIMATE_OCEAN_LOAD = .false.
TOPOGRAPHY = .false.
ATTENUATION = .false.
USE_OLSEN_ATTENUATION = .false.
Modified: seismo/3D/SPECFEM3D/trunk/examples/noise_tomography/DATA/Par_file_step2
===================================================================
--- seismo/3D/SPECFEM3D/trunk/examples/noise_tomography/DATA/Par_file_step2 2013-03-13 00:00:35 UTC (rev 21517)
+++ seismo/3D/SPECFEM3D/trunk/examples/noise_tomography/DATA/Par_file_step2 2013-03-13 00:23:42 UTC (rev 21518)
@@ -29,7 +29,7 @@
MODEL = default
# parameters describing the model
-OCEANS = .false.
+APPROXIMATE_OCEAN_LOAD = .false.
TOPOGRAPHY = .false.
ATTENUATION = .false.
USE_OLSEN_ATTENUATION = .false.
Modified: seismo/3D/SPECFEM3D/trunk/examples/noise_tomography/DATA/Par_file_step3
===================================================================
--- seismo/3D/SPECFEM3D/trunk/examples/noise_tomography/DATA/Par_file_step3 2013-03-13 00:00:35 UTC (rev 21517)
+++ seismo/3D/SPECFEM3D/trunk/examples/noise_tomography/DATA/Par_file_step3 2013-03-13 00:23:42 UTC (rev 21518)
@@ -29,7 +29,7 @@
MODEL = default
# parameters describing the model
-OCEANS = .false.
+APPROXIMATE_OCEAN_LOAD = .false.
TOPOGRAPHY = .false.
ATTENUATION = .false.
USE_OLSEN_ATTENUATION = .false.
Modified: seismo/3D/SPECFEM3D/trunk/examples/splay_faults/DATA/Par_file
===================================================================
--- seismo/3D/SPECFEM3D/trunk/examples/splay_faults/DATA/Par_file 2013-03-13 00:00:35 UTC (rev 21517)
+++ seismo/3D/SPECFEM3D/trunk/examples/splay_faults/DATA/Par_file 2013-03-13 00:23:42 UTC (rev 21518)
@@ -23,7 +23,7 @@
# If you use our internal mesher, the only option is 8-node bricks (27-node elements are not supported)
# CUBIT does not support HEX27 elements either (it can generate them, but they are flat, i.e. identical to HEX8).
# To generate HEX27 elements with curvature properly taken into account, you can use Gmsh http://geuz.org/gmsh/
-NGNOD = 8
+NGNOD = 8
# models:
# available options are:
@@ -35,7 +35,7 @@
MODEL = default
# parameters describing the model
-OCEANS = .false.
+APPROXIMATE_OCEAN_LOAD = .false.
TOPOGRAPHY = .false.
ATTENUATION = .false.
ANISOTROPY = .false.
@@ -55,11 +55,11 @@
ABSORB_INSTEAD_OF_FREE_SURFACE = .false.
# C-PML boundary conditions for a regional simulation
-PML_CONDITIONS = .false.
+PML_CONDITIONS = .false.
# C-PML top surface
PML_INSTEAD_OF_FREE_SURFACE = .false.
-
+
# C-PML thickness min/max
PML_WIDTH_MIN = 10000.0d0
PML_WIDTH_MAX = 25000.0d0
@@ -67,7 +67,7 @@
# C-PML dominant frequency
f0_FOR_PML = 12.7
-# parameters used to rotate C-PML boundary conditions by a given angle (not completed yet)
+# parameters used to rotate C-PML boundary conditions by a given angle (not completed yet)
# ROTATE_PML_ACTIVATE = .false.
# ROTATE_PML_ANGLE = 0.
@@ -112,7 +112,7 @@
# its norm is ignored and the norm of the force used is the factor force source times the source time function.
USE_FORCE_POINT_SOURCE = .false.
-# set to true to use a Ricker source time function instead of the source time functions set by default
+# set to true to use a Ricker source time function instead of the source time functions set by default
# to represent a (tilted) FORCESOLUTION force point source or a CMTSOLUTION moment-tensor source.
USE_RICKER_TIME_FUNCTION = .false.
Modified: seismo/3D/SPECFEM3D/trunk/examples/splay_faults/DATA/Par_file_faults.barrier
===================================================================
--- seismo/3D/SPECFEM3D/trunk/examples/splay_faults/DATA/Par_file_faults.barrier 2013-03-13 00:00:35 UTC (rev 21517)
+++ seismo/3D/SPECFEM3D/trunk/examples/splay_faults/DATA/Par_file_faults.barrier 2013-03-13 00:23:42 UTC (rev 21518)
@@ -2,36 +2,36 @@
0.00134 ! #tag #eta(damping) FAULT A
0.00134 ! #tag #eta(damping) FAULT BC
1 ! 1 = dyn 2=kin
-100 ! NTOUT : Number of time steps
+100 ! NTOUT : Number of time steps
1000 ! NTSNAP: time interation of snapshots
-1e0 ! V_HEALING (-1 : Healing off)
1e-3 ! V_RUPT
&BEGIN_FAULT /
-&INIT_STRESS S1=0.0e6,S2=0.0e0,S3=-4.78e6,n1=0,n2=3,n3=3 /
-&DIST2D shape='rectangle', val = -2.16e6, xc = 113.5e3, yc =120.0e3, zc= -19500.0e0, lx=227.0e3, ly=80.0e3, lz=30000.0e0 /
-&DIST2D shape='rectangle', val = -2.88e6, xc = 166521.863e0, yc =148.0e3, zc= -7962.09773e0,lx=23794.68e0, ly=24.0e3, lz=3132.628e0 /
-&DIST2D shape='rectangle-taper', val = -2.16e6, valh =-0.216e6,xc = 226407.564e0, yc =120.0e3, zc= -4.50e3,lx=22787.2623e0, ly=80.0e3, lz=3.0e3 /
-&DIST2D shape='rectangle', val =-0.478e6, xc = 113.5e3, yc =120.0e3, zc= -15000.0e0, lx=227.0e3, ly=80.0e3, lz=30000.0e0 /
-&DIST2D shape='rectangle', val = -4.78e6, xc = 113.5e3, yc =120.0e3, zc= -19500.0e0, lx=227.0e3, ly=80.0e3, lz=30000.0e0 /
-&DIST2D shape='rectangle-taper', val = -4.78e6, valh=-0.478e6, xc = 226407.564e0, yc =120.0e3, zc= -4.50e3, lx=22787.2623e0, ly=80.0e3, lz=3.0e3 /
+&INIT_STRESS S1=0.0e6,S2=0.0e0,S3=-4.78e6,n1=0,n2=3,n3=3 /
+&DIST2D shape='rectangle', val = -2.16e6, xc = 113.5e3, yc =120.0e3, zc= -19500.0e0, lx=227.0e3, ly=80.0e3, lz=30000.0e0 /
+&DIST2D shape='rectangle', val = -2.88e6, xc = 166521.863e0, yc =148.0e3, zc= -7962.09773e0,lx=23794.68e0, ly=24.0e3, lz=3132.628e0 /
+&DIST2D shape='rectangle-taper', val = -2.16e6, valh =-0.216e6,xc = 226407.564e0, yc =120.0e3, zc= -4.50e3,lx=22787.2623e0, ly=80.0e3, lz=3.0e3 /
+&DIST2D shape='rectangle', val =-0.478e6, xc = 113.5e3, yc =120.0e3, zc= -15000.0e0, lx=227.0e3, ly=80.0e3, lz=30000.0e0 /
+&DIST2D shape='rectangle', val = -4.78e6, xc = 113.5e3, yc =120.0e3, zc= -19500.0e0, lx=227.0e3, ly=80.0e3, lz=30000.0e0 /
+&DIST2D shape='rectangle-taper', val = -4.78e6, valh=-0.478e6, xc = 226407.564e0, yc =120.0e3, zc= -4.50e3, lx=22787.2623e0, ly=80.0e3, lz=3.0e3 /
-&SWF mus=1000.0e0,mud=1000.0e0,dc=0.5e0,nmus=1,nmud=1,ndc=0 /
-&DIST2D shape='rectangle', val = 0.6e0, xc = 113.5e3, yc =135.0e3, zc= -15.0e3, lx=227.0e3, ly=50.0e3, lz=30000.0e0 /
-&DIST2D shape='rectangle', val = 0.2e0, xc = 113.5e3, yc =135.0e3, zc= -15.0e3, lx=227.0e3, ly=50.0e3, lz=30000.0e0 /
+&SWF mus=1000.0e0,mud=1000.0e0,dc=0.5e0,nmus=1,nmud=1,ndc=0 /
+&DIST2D shape='rectangle', val = 0.6e0, xc = 113.5e3, yc =135.0e3, zc= -15.0e3, lx=227.0e3, ly=50.0e3, lz=30000.0e0 /
+&DIST2D shape='rectangle', val = 0.2e0, xc = 113.5e3, yc =135.0e3, zc= -15.0e3, lx=227.0e3, ly=50.0e3, lz=30000.0e0 /
&BEGIN_FAULT /
-&INIT_STRESS S1=0.0e6,S2=0.0e0,S3=-100.0e6,n1=0,n2=3,n3=4 /
-&DIST2D shape='rectangle', val = -5.69e6, xc = 70514.4284e0, yc =120.0e3, zc=-11.25e3, lx=23382.6859e0, ly=80.0e3, lz=13.5e3 /
-&DIST2D shape='rectangle', val = -3.54e6, xc = 43894.8822e0, yc =120.0e3, zc=-22.0e3, lx=29856.4065e0, ly=80.0e3, lz= 8.0e3 /
-&DIST2D shape='rectangle-taper', val = -5.69e6, valh=-0.569e6, xc = 82205.7714e0, yc =120.0e3, zc= -4.5e3, lx=5196.15242e0, ly=80.0e3, lz=3.0e3 /
-&DIST2D shape='rectangle', val =-1.238e6, xc = 74411.5427e0, yc =120.0e3, zc= -9.0e3, lx=31176.9145e0, ly=80.0e3, lz=18.0e3 /
-&DIST2D shape='rectangle', val =-12.38e6, xc = 70514.4284e0, yc =120.0e3, zc=-11.25e3, lx=23382.6859e0, ly=80.0e3, lz=13.5e3 /
-&DIST2D shape='rectangle-taper', val =-12.38e6, valh=-1.238e6, xc = 82205.7714e0, yc =120.0e3, zc= -4.5e3, lx=5196.15242e0, ly=80.0e3, lz=3.0e3 /
-&DIST2D shape='rectangle', val = -9.04e6, xc = 43894.8822e0, yc =120.0e3, zc=-22.0e3, lx=29856.4065e0, ly=80.0e3, lz= 8.0e3 /
+&INIT_STRESS S1=0.0e6,S2=0.0e0,S3=-100.0e6,n1=0,n2=3,n3=4 /
+&DIST2D shape='rectangle', val = -5.69e6, xc = 70514.4284e0, yc =120.0e3, zc=-11.25e3, lx=23382.6859e0, ly=80.0e3, lz=13.5e3 /
+&DIST2D shape='rectangle', val = -3.54e6, xc = 43894.8822e0, yc =120.0e3, zc=-22.0e3, lx=29856.4065e0, ly=80.0e3, lz= 8.0e3 /
+&DIST2D shape='rectangle-taper', val = -5.69e6, valh=-0.569e6, xc = 82205.7714e0, yc =120.0e3, zc= -4.5e3, lx=5196.15242e0, ly=80.0e3, lz=3.0e3 /
+&DIST2D shape='rectangle', val =-1.238e6, xc = 74411.5427e0, yc =120.0e3, zc= -9.0e3, lx=31176.9145e0, ly=80.0e3, lz=18.0e3 /
+&DIST2D shape='rectangle', val =-12.38e6, xc = 70514.4284e0, yc =120.0e3, zc=-11.25e3, lx=23382.6859e0, ly=80.0e3, lz=13.5e3 /
+&DIST2D shape='rectangle-taper', val =-12.38e6, valh=-1.238e6, xc = 82205.7714e0, yc =120.0e3, zc= -4.5e3, lx=5196.15242e0, ly=80.0e3, lz=3.0e3 /
+&DIST2D shape='rectangle', val = -9.04e6, xc = 43894.8822e0, yc =120.0e3, zc=-22.0e3, lx=29856.4065e0, ly=80.0e3, lz= 8.0e3 /
-&SWF mus=1000.e0,mud=1000.0e0,dc=0.5e0,nmus=1,nmud=1,ndc=0 /
-&DIST2D shape='rectangle', val = 0.6e0, xc = 60.1915e3, yc =120.0e3, zc=-13.0e3, lx=59616.98e0, ly=80.0e3, lz=26.0e3 /
-&DIST2D shape='rectangle', val = 0.2e0, xc = 60.1915e3, yc =120.0e3, zc=-13.0e3, lx=59616.98e0, ly=80.0e3, lz=26.0e3 /
+&SWF mus=1000.e0,mud=1000.0e0,dc=0.5e0,nmus=1,nmud=1,ndc=0 /
+&DIST2D shape='rectangle', val = 0.6e0, xc = 60.1915e3, yc =120.0e3, zc=-13.0e3, lx=59616.98e0, ly=80.0e3, lz=26.0e3 /
+&DIST2D shape='rectangle', val = 0.2e0, xc = 60.1915e3, yc =120.0e3, zc=-13.0e3, lx=59616.98e0, ly=80.0e3, lz=26.0e3 /
Modified: seismo/3D/SPECFEM3D/trunk/examples/splay_faults/DATA/Par_file_faults.homogeneous
===================================================================
--- seismo/3D/SPECFEM3D/trunk/examples/splay_faults/DATA/Par_file_faults.homogeneous 2013-03-13 00:00:35 UTC (rev 21517)
+++ seismo/3D/SPECFEM3D/trunk/examples/splay_faults/DATA/Par_file_faults.homogeneous 2013-03-13 00:23:42 UTC (rev 21518)
@@ -2,36 +2,36 @@
0.00134 ! #tag #eta(damping) FAULT A
0.00134 ! #tag #eta(damping) FAULT BC
1 ! 1 = dyn 2=kin
-100 ! NTOUT : Number of time steps
+100 ! NTOUT : Number of time steps
1000 ! NTSNAP: time interation of snapshots
-1e0 ! V_HEALING (-1 : Healing off)
1e-3 ! V_RUPT
&BEGIN_FAULT /
-&INIT_STRESS S1=0.0e6,S2=0.0e0,S3=-4.78e6,n1=0,n2=3,n3=3 /
-&DIST2D shape='rectangle', val = -2.16e6, xc = 113.5e3, yc =120.0e3, zc= -19500.0e0, lx=227.0e3, ly=80.0e3, lz=30000.0e0 /
-&DIST2D shape='rectangle', val = -2.88e6, xc = 166521.863e0, yc =148.0e3, zc= -7962.09773e0,lx=23794.68e0, ly=24.0e3, lz=3132.628e0 /
-&DIST2D shape='rectangle-taper', val = -2.16e6, valh =-0.216e6,xc = 226407.564e0, yc =120.0e3, zc= -4.50e3,lx=22787.2623e0, ly=80.0e3, lz=3.0e3 /
-&DIST2D shape='rectangle', val =-0.478e6, xc = 113.5e3, yc =120.0e3, zc= -15000.0e0, lx=227.0e3, ly=80.0e3, lz=30000.0e0 /
-&DIST2D shape='rectangle', val = -4.78e6, xc = 113.5e3, yc =120.0e3, zc= -19500.0e0, lx=227.0e3, ly=80.0e3, lz=30000.0e0 /
-&DIST2D shape='rectangle-taper', val = -4.78e6, valh=-0.478e6, xc = 226407.564e0, yc =120.0e3, zc= -4.50e3, lx=22787.2623e0, ly=80.0e3, lz=3.0e3 /
+&INIT_STRESS S1=0.0e6,S2=0.0e0,S3=-4.78e6,n1=0,n2=3,n3=3 /
+&DIST2D shape='rectangle', val = -2.16e6, xc = 113.5e3, yc =120.0e3, zc= -19500.0e0, lx=227.0e3, ly=80.0e3, lz=30000.0e0 /
+&DIST2D shape='rectangle', val = -2.88e6, xc = 166521.863e0, yc =148.0e3, zc= -7962.09773e0,lx=23794.68e0, ly=24.0e3, lz=3132.628e0 /
+&DIST2D shape='rectangle-taper', val = -2.16e6, valh =-0.216e6,xc = 226407.564e0, yc =120.0e3, zc= -4.50e3,lx=22787.2623e0, ly=80.0e3, lz=3.0e3 /
+&DIST2D shape='rectangle', val =-0.478e6, xc = 113.5e3, yc =120.0e3, zc= -15000.0e0, lx=227.0e3, ly=80.0e3, lz=30000.0e0 /
+&DIST2D shape='rectangle', val = -4.78e6, xc = 113.5e3, yc =120.0e3, zc= -19500.0e0, lx=227.0e3, ly=80.0e3, lz=30000.0e0 /
+&DIST2D shape='rectangle-taper', val = -4.78e6, valh=-0.478e6, xc = 226407.564e0, yc =120.0e3, zc= -4.50e3, lx=22787.2623e0, ly=80.0e3, lz=3.0e3 /
-&SWF mus=1000.0e0,mud=1000.0e0,dc=0.5e0,nmus=1,nmud=1,ndc=0 /
-&DIST2D shape='rectangle', val = 0.6e0, xc = 113.5e3, yc =120.0e3, zc= -15.0e3, lx=227.0e3, ly=80.0e3, lz=30000.0e0 /
-&DIST2D shape='rectangle', val = 0.2e0, xc = 113.5e3, yc =120.0e3, zc= -15.0e3, lx=227.0e3, ly=80.0e3, lz=30000.0e0 /
+&SWF mus=1000.0e0,mud=1000.0e0,dc=0.5e0,nmus=1,nmud=1,ndc=0 /
+&DIST2D shape='rectangle', val = 0.6e0, xc = 113.5e3, yc =120.0e3, zc= -15.0e3, lx=227.0e3, ly=80.0e3, lz=30000.0e0 /
+&DIST2D shape='rectangle', val = 0.2e0, xc = 113.5e3, yc =120.0e3, zc= -15.0e3, lx=227.0e3, ly=80.0e3, lz=30000.0e0 /
&BEGIN_FAULT /
-&INIT_STRESS S1=0.0e6,S2=0.0e0,S3=-100.0e6,n1=0,n2=3,n3=4 /
-&DIST2D shape='rectangle', val = -5.69e6, xc = 70514.4284e0, yc =120.0e3, zc=-11.25e3, lx=23382.6859e0, ly=80.0e3, lz=13.5e3 /
-&DIST2D shape='rectangle', val = -3.54e6, xc = 43894.8822e0, yc =120.0e3, zc=-22.0e3, lx=29856.4065e0, ly=80.0e3, lz= 8.0e3 /
-&DIST2D shape='rectangle-taper', val = -5.69e6, valh=-0.569e6, xc = 82205.7714e0, yc =120.0e3, zc= -4.5e3, lx=5196.15242e0, ly=80.0e3, lz=3.0e3 /
-&DIST2D shape='rectangle', val =-1.238e6, xc = 74411.5427e0, yc =120.0e3, zc= -9.0e3, lx=31176.9145e0, ly=80.0e3, lz=18.0e3 /
-&DIST2D shape='rectangle', val =-12.38e6, xc = 70514.4284e0, yc =120.0e3, zc=-11.25e3, lx=23382.6859e0, ly=80.0e3, lz=13.5e3 /
-&DIST2D shape='rectangle-taper', val =-12.38e6, valh=-1.238e6, xc = 82205.7714e0, yc =120.0e3, zc= -4.5e3, lx=5196.15242e0, ly=80.0e3, lz=3.0e3 /
-&DIST2D shape='rectangle', val = -9.04e6, xc = 43894.8822e0, yc =120.0e3, zc=-22.0e3, lx=29856.4065e0, ly=80.0e3, lz= 8.0e3 /
+&INIT_STRESS S1=0.0e6,S2=0.0e0,S3=-100.0e6,n1=0,n2=3,n3=4 /
+&DIST2D shape='rectangle', val = -5.69e6, xc = 70514.4284e0, yc =120.0e3, zc=-11.25e3, lx=23382.6859e0, ly=80.0e3, lz=13.5e3 /
+&DIST2D shape='rectangle', val = -3.54e6, xc = 43894.8822e0, yc =120.0e3, zc=-22.0e3, lx=29856.4065e0, ly=80.0e3, lz= 8.0e3 /
+&DIST2D shape='rectangle-taper', val = -5.69e6, valh=-0.569e6, xc = 82205.7714e0, yc =120.0e3, zc= -4.5e3, lx=5196.15242e0, ly=80.0e3, lz=3.0e3 /
+&DIST2D shape='rectangle', val =-1.238e6, xc = 74411.5427e0, yc =120.0e3, zc= -9.0e3, lx=31176.9145e0, ly=80.0e3, lz=18.0e3 /
+&DIST2D shape='rectangle', val =-12.38e6, xc = 70514.4284e0, yc =120.0e3, zc=-11.25e3, lx=23382.6859e0, ly=80.0e3, lz=13.5e3 /
+&DIST2D shape='rectangle-taper', val =-12.38e6, valh=-1.238e6, xc = 82205.7714e0, yc =120.0e3, zc= -4.5e3, lx=5196.15242e0, ly=80.0e3, lz=3.0e3 /
+&DIST2D shape='rectangle', val = -9.04e6, xc = 43894.8822e0, yc =120.0e3, zc=-22.0e3, lx=29856.4065e0, ly=80.0e3, lz= 8.0e3 /
-&SWF mus=1000.e0,mud=1000.0e0,dc=0.5e0,nmus=1,nmud=1,ndc=0 /
-&DIST2D shape='rectangle', val = 0.6e0, xc = 60.1915e3, yc =120.0e3, zc=-13.0e3, lx=59616.98e0, ly=80.0e3, lz=26.0e3 /
-&DIST2D shape='rectangle', val = 0.2e0, xc = 60.1915e3, yc =120.0e3, zc=-13.0e3, lx=59616.98e0, ly=80.0e3, lz=26.0e3 /
+&SWF mus=1000.e0,mud=1000.0e0,dc=0.5e0,nmus=1,nmud=1,ndc=0 /
+&DIST2D shape='rectangle', val = 0.6e0, xc = 60.1915e3, yc =120.0e3, zc=-13.0e3, lx=59616.98e0, ly=80.0e3, lz=26.0e3 /
+&DIST2D shape='rectangle', val = 0.2e0, xc = 60.1915e3, yc =120.0e3, zc=-13.0e3, lx=59616.98e0, ly=80.0e3, lz=26.0e3 /
Modified: seismo/3D/SPECFEM3D/trunk/examples/tomographic_model/DATA/Par_file
===================================================================
--- seismo/3D/SPECFEM3D/trunk/examples/tomographic_model/DATA/Par_file 2013-03-13 00:00:35 UTC (rev 21517)
+++ seismo/3D/SPECFEM3D/trunk/examples/tomographic_model/DATA/Par_file 2013-03-13 00:23:42 UTC (rev 21518)
@@ -23,7 +23,7 @@
# If you use our internal mesher, the only option is 8-node bricks (27-node elements are not supported)
# CUBIT does not support HEX27 elements either (it can generate them, but they are flat, i.e. identical to HEX8).
# To generate HEX27 elements with curvature properly taken into account, you can use Gmsh http://geuz.org/gmsh/
-NGNOD = 8
+NGNOD = 8
# models:
# available options are:
@@ -35,7 +35,7 @@
MODEL = default
# parameters describing the model
-OCEANS = .false.
+APPROXIMATE_OCEAN_LOAD = .false.
TOPOGRAPHY = .false.
ATTENUATION = .false.
ANISOTROPY = .false.
@@ -55,7 +55,7 @@
ABSORB_INSTEAD_OF_FREE_SURFACE = .false.
# C-PML boundary conditions for a regional simulation
-PML_CONDITIONS = .false.
+PML_CONDITIONS = .false.
# C-PML top surface
PML_INSTEAD_OF_FREE_SURFACE = .false.
@@ -67,7 +67,7 @@
# C-PML dominant frequency
f0_FOR_PML = 12.7
-# parameters used to rotate C-PML boundary conditions by a given angle (not completed yet)
+# parameters used to rotate C-PML boundary conditions by a given angle (not completed yet)
# ROTATE_PML_ACTIVATE = .false.
# ROTATE_PML_ANGLE = 0.
@@ -97,7 +97,7 @@
# interval in time steps for reading adjoint traces
# 0 = read the whole adjoint sources at the same time
-NTSTEP_BETWEEN_READ_ADJSRC = 0
+NTSTEP_BETWEEN_READ_ADJSRC = 0
# use a (tilted) FORCESOLUTION force point source (or several) instead of a CMTSOLUTION moment-tensor source.
# This can be useful e.g. for oil industry foothills simulations or asteroid simulations
@@ -112,7 +112,7 @@
# its norm is ignored and the norm of the force used is the factor force source times the source time function.
USE_FORCE_POINT_SOURCE = .false.
-# set to true to use a Ricker source time function instead of the source time functions set by default
+# set to true to use a Ricker source time function instead of the source time functions set by default
# to represent a (tilted) FORCESOLUTION force point source or a CMTSOLUTION moment-tensor source.
USE_RICKER_TIME_FUNCTION = .false.
Modified: seismo/3D/SPECFEM3D/trunk/examples/tpv102/DATA/Par_file
===================================================================
--- seismo/3D/SPECFEM3D/trunk/examples/tpv102/DATA/Par_file 2013-03-13 00:00:35 UTC (rev 21517)
+++ seismo/3D/SPECFEM3D/trunk/examples/tpv102/DATA/Par_file 2013-03-13 00:23:42 UTC (rev 21518)
@@ -23,7 +23,7 @@
# If you use our internal mesher, the only option is 8-node bricks (27-node elements are not supported)
# CUBIT does not support HEX27 elements either (it can generate them, but they are flat, i.e. identical to HEX8).
# To generate HEX27 elements with curvature properly taken into account, you can use Gmsh http://geuz.org/gmsh/
-NGNOD = 8
+NGNOD = 8
# models:
# available options are:
@@ -35,7 +35,7 @@
MODEL = default
# parameters describing the model
-OCEANS = .false.
+APPROXIMATE_OCEAN_LOAD = .false.
TOPOGRAPHY = .false.
ATTENUATION = .false.
ANISOTROPY = .false.
@@ -55,11 +55,11 @@
ABSORB_INSTEAD_OF_FREE_SURFACE = .false.
# C-PML boundary conditions for a regional simulation
-PML_CONDITIONS = .false.
+PML_CONDITIONS = .false.
# C-PML top surface
PML_INSTEAD_OF_FREE_SURFACE = .false.
-
+
# C-PML thickness min/max
PML_WIDTH_MIN = 10000.0d0
PML_WIDTH_MAX = 25000.0d0
@@ -67,7 +67,7 @@
# C-PML dominant frequency
f0_FOR_PML = 12.7
-# parameters used to rotate C-PML boundary conditions by a given angle (not completed yet)
+# parameters used to rotate C-PML boundary conditions by a given angle (not completed yet)
# ROTATE_PML_ACTIVATE = .false.
# ROTATE_PML_ANGLE = 0.
@@ -112,7 +112,7 @@
# its norm is ignored and the norm of the force used is the factor force source times the source time function.
USE_FORCE_POINT_SOURCE = .false.
-# set to true to use a Ricker source time function instead of the source time functions set by default
+# set to true to use a Ricker source time function instead of the source time functions set by default
# to represent a (tilted) FORCESOLUTION force point source or a CMTSOLUTION moment-tensor source.
USE_RICKER_TIME_FUNCTION = .false.
Modified: seismo/3D/SPECFEM3D/trunk/examples/tpv102/DATA/Par_file_faults
===================================================================
--- seismo/3D/SPECFEM3D/trunk/examples/tpv102/DATA/Par_file_faults 2013-03-13 00:00:35 UTC (rev 21517)
+++ seismo/3D/SPECFEM3D/trunk/examples/tpv102/DATA/Par_file_faults 2013-03-13 00:23:42 UTC (rev 21518)
@@ -1,7 +1,7 @@
1
0.00051 ! #tag #eta(damping) FAULT A
1 ! 1 = dyn 2=kin
-6000 ! NTOUT : Number of time steps
+6000 ! NTOUT : Number of time steps
200 ! NTSNAP: time interation of snapshots
-1e0 ! V_HEALING (-1 : Healing off)
1e-3 ! V_RUPT
Modified: seismo/3D/SPECFEM3D/trunk/examples/tpv103/DATA/Par_file
===================================================================
--- seismo/3D/SPECFEM3D/trunk/examples/tpv103/DATA/Par_file 2013-03-13 00:00:35 UTC (rev 21517)
+++ seismo/3D/SPECFEM3D/trunk/examples/tpv103/DATA/Par_file 2013-03-13 00:23:42 UTC (rev 21518)
@@ -23,7 +23,7 @@
# If you use our internal mesher, the only option is 8-node bricks (27-node elements are not supported)
# CUBIT does not support HEX27 elements either (it can generate them, but they are flat, i.e. identical to HEX8).
# To generate HEX27 elements with curvature properly taken into account, you can use Gmsh http://geuz.org/gmsh/
-NGNOD = 8
+NGNOD = 8
# models:
# available options are:
@@ -35,7 +35,7 @@
MODEL = default
# parameters describing the model
-OCEANS = .false.
+APPROXIMATE_OCEAN_LOAD = .false.
TOPOGRAPHY = .false.
ATTENUATION = .false.
ANISOTROPY = .false.
@@ -55,11 +55,11 @@
ABSORB_INSTEAD_OF_FREE_SURFACE = .false.
# C-PML boundary conditions for a regional simulation
-PML_CONDITIONS = .false.
+PML_CONDITIONS = .false.
# C-PML top surface
PML_INSTEAD_OF_FREE_SURFACE = .false.
-
+
# C-PML thickness min/max
PML_WIDTH_MIN = 10000.0d0
PML_WIDTH_MAX = 25000.0d0
@@ -67,7 +67,7 @@
# C-PML dominant frequency
f0_FOR_PML = 12.7
-# parameters used to rotate C-PML boundary conditions by a given angle (not completed yet)
+# parameters used to rotate C-PML boundary conditions by a given angle (not completed yet)
# ROTATE_PML_ACTIVATE = .false.
# ROTATE_PML_ANGLE = 0.
@@ -112,7 +112,7 @@
# its norm is ignored and the norm of the force used is the factor force source times the source time function.
USE_FORCE_POINT_SOURCE = .false.
-# set to true to use a Ricker source time function instead of the source time functions set by default
+# set to true to use a Ricker source time function instead of the source time functions set by default
# to represent a (tilted) FORCESOLUTION force point source or a CMTSOLUTION moment-tensor source.
USE_RICKER_TIME_FUNCTION = .false.
Modified: seismo/3D/SPECFEM3D/trunk/examples/tpv103/DATA/Par_file_faults
===================================================================
--- seismo/3D/SPECFEM3D/trunk/examples/tpv103/DATA/Par_file_faults 2013-03-13 00:00:35 UTC (rev 21517)
+++ seismo/3D/SPECFEM3D/trunk/examples/tpv103/DATA/Par_file_faults 2013-03-13 00:23:42 UTC (rev 21518)
@@ -1,7 +1,7 @@
1
0.00134 ! #tag #eta(damping) FAULT A
1 ! 1 = dyn 2=kin
-1200 ! NTOUT : Number of time steps
+1200 ! NTOUT : Number of time steps
200 ! NTSNAP: time interation of snapshots
-1e0 ! V_HEALING (-1 : Healing off)
1e-3 ! V_RUPT
Modified: seismo/3D/SPECFEM3D/trunk/examples/tpv15/DATA/Par_file
===================================================================
--- seismo/3D/SPECFEM3D/trunk/examples/tpv15/DATA/Par_file 2013-03-13 00:00:35 UTC (rev 21517)
+++ seismo/3D/SPECFEM3D/trunk/examples/tpv15/DATA/Par_file 2013-03-13 00:23:42 UTC (rev 21518)
@@ -23,7 +23,7 @@
# If you use our internal mesher, the only option is 8-node bricks (27-node elements are not supported)
# CUBIT does not support HEX27 elements either (it can generate them, but they are flat, i.e. identical to HEX8).
# To generate HEX27 elements with curvature properly taken into account, you can use Gmsh http://geuz.org/gmsh/
-NGNOD = 8
+NGNOD = 8
# models:
# available options are:
@@ -35,7 +35,7 @@
MODEL = default
# parameters describing the model
-OCEANS = .false.
+APPROXIMATE_OCEAN_LOAD = .false.
TOPOGRAPHY = .false.
ATTENUATION = .false.
ANISOTROPY = .false.
@@ -55,11 +55,11 @@
ABSORB_INSTEAD_OF_FREE_SURFACE = .false.
# C-PML boundary conditions for a regional simulation
-PML_CONDITIONS = .false.
+PML_CONDITIONS = .false.
# C-PML top surface
PML_INSTEAD_OF_FREE_SURFACE = .false.
-
+
# C-PML thickness min/max
PML_WIDTH_MIN = 10000.0d0
PML_WIDTH_MAX = 25000.0d0
@@ -67,7 +67,7 @@
# C-PML dominant frequency
f0_FOR_PML = 12.7
-# parameters used to rotate C-PML boundary conditions by a given angle (not completed yet)
+# parameters used to rotate C-PML boundary conditions by a given angle (not completed yet)
# ROTATE_PML_ACTIVATE = .false.
# ROTATE_PML_ANGLE = 0.
@@ -112,7 +112,7 @@
# its norm is ignored and the norm of the force used is the factor force source times the source time function.
USE_FORCE_POINT_SOURCE = .false.
-# set to true to use a Ricker source time function instead of the source time functions set by default
+# set to true to use a Ricker source time function instead of the source time functions set by default
# to represent a (tilted) FORCESOLUTION force point source or a CMTSOLUTION moment-tensor source.
USE_RICKER_TIME_FUNCTION = .false.
Modified: seismo/3D/SPECFEM3D/trunk/examples/tpv15/DATA/Par_file_faults
===================================================================
--- seismo/3D/SPECFEM3D/trunk/examples/tpv15/DATA/Par_file_faults 2013-03-13 00:00:35 UTC (rev 21517)
+++ seismo/3D/SPECFEM3D/trunk/examples/tpv15/DATA/Par_file_faults 2013-03-13 00:23:42 UTC (rev 21518)
@@ -2,26 +2,26 @@
0.00067 ! #tag #eta(damping) FAULT Main fault
0.00067 ! #tag #eta(damping) FAULT Branch
1 ! 1 = dyn 2=kin
-100 ! NTOUT : Number of time steps
+100 ! NTOUT : Number of time steps
1000 ! NTSNAP: time interation of snapshots
-1e0 ! V_HEALING (-1 : Healing off)
1e-3 ! V_RUPT
&BEGIN_FAULT /
-&INIT_STRESS S1=0.0e6,S2=0.0e0,S3=-120.0e6,n1=2,n2=0,n3=0 /
-&DIST2D shape='rectangle', val = -70.0e6, xc = -2.0e3, yc =0.0e3, zc= -7.5e3, lx=28.0e3, ly=100.0e0, lz=15.0e3 /
-&DIST2D shape='rectangle', val = -81.6e6, xc = -8.0e3, yc =0.0e3, zc= -7.5e3, lx=3.1e3, ly=100.0e0, lz=3.0e3 /
+&INIT_STRESS S1=0.0e6,S2=0.0e0,S3=-120.0e6,n1=2,n2=0,n3=0 /
+&DIST2D shape='rectangle', val = -70.0e6, xc = -2.0e3, yc =0.0e3, zc= -7.5e3, lx=28.0e3, ly=100.0e0, lz=15.0e3 /
+&DIST2D shape='rectangle', val = -81.6e6, xc = -8.0e3, yc =0.0e3, zc= -7.5e3, lx=3.1e3, ly=100.0e0, lz=3.0e3 /
-&SWF mus=1000.0e0,mud=1000.0e0,dc=0.4e0,nmus=1,nmud=1,ndc=0 /
-&DIST2D shape='rectangle', val = 0.677e0, xc = -2.0e3, yc =0.0e3, zc= -7.5e3, lx=28.0e3, ly=100.0e0, lz=15.0e3 /
-&DIST2D shape='rectangle', val = 0.525e0, xc = -2.0e3, yc =0.0e3, zc= -7.5e3, lx=28.0e3, ly=100.0e0, lz=15.0e3 /
+&SWF mus=1000.0e0,mud=1000.0e0,dc=0.4e0,nmus=1,nmud=1,ndc=0 /
+&DIST2D shape='rectangle', val = 0.677e0, xc = -2.0e3, yc =0.0e3, zc= -7.5e3, lx=28.0e3, ly=100.0e0, lz=15.0e3 /
+&DIST2D shape='rectangle', val = 0.525e0, xc = -2.0e3, yc =0.0e3, zc= -7.5e3, lx=28.0e3, ly=100.0e0, lz=15.0e3 /
&BEGIN_FAULT /
-&INIT_STRESS S1=0.0e6,S2=0.0e0,S3=-120.0e6,n1=1,n2=0,n3=0 /
-&DIST2D shape='rectangle', val = -78.0e6, xc = 5152.85115e0, yc =-3025.0e0, zc=-7.5e3, lx=10478.9074e0, ly=6050.0e0, lz=15.0e3 /
+&INIT_STRESS S1=0.0e6,S2=0.0e0,S3=-120.0e6,n1=1,n2=0,n3=0 /
+&DIST2D shape='rectangle', val = -78.0e6, xc = 5152.85115e0, yc =-3025.0e0, zc=-7.5e3, lx=10478.9074e0, ly=6050.0e0, lz=15.0e3 /
-&SWF mus=1000.e0,mud=1000.0e0,dc=0.4e0,nmus=1,nmud=1,ndc=0 /
-&DIST2D shape='rectangle', val = 0.677e0, xc = 5152.85115e0, yc =-3025.0e0, zc=-7.5e3, lx=10478.9074e0, ly=6050.0e0, lz=15.0e3 /
-&DIST2D shape='rectangle', val = 0.525e0, xc = 5152.85115e0, yc =-3025.0e0, zc=-7.5e3, lx=10478.9074e0, ly=6050.0e0, lz=15.0e3 /
+&SWF mus=1000.e0,mud=1000.0e0,dc=0.4e0,nmus=1,nmud=1,ndc=0 /
+&DIST2D shape='rectangle', val = 0.677e0, xc = 5152.85115e0, yc =-3025.0e0, zc=-7.5e3, lx=10478.9074e0, ly=6050.0e0, lz=15.0e3 /
+&DIST2D shape='rectangle', val = 0.525e0, xc = 5152.85115e0, yc =-3025.0e0, zc=-7.5e3, lx=10478.9074e0, ly=6050.0e0, lz=15.0e3 /
Modified: seismo/3D/SPECFEM3D/trunk/examples/tpv16/DATA/Par_file
===================================================================
--- seismo/3D/SPECFEM3D/trunk/examples/tpv16/DATA/Par_file 2013-03-13 00:00:35 UTC (rev 21517)
+++ seismo/3D/SPECFEM3D/trunk/examples/tpv16/DATA/Par_file 2013-03-13 00:23:42 UTC (rev 21518)
@@ -23,7 +23,7 @@
# If you use our internal mesher, the only option is 8-node bricks (27-node elements are not supported)
# CUBIT does not support HEX27 elements either (it can generate them, but they are flat, i.e. identical to HEX8).
# To generate HEX27 elements with curvature properly taken into account, you can use Gmsh http://geuz.org/gmsh/
-NGNOD = 8
+NGNOD = 8
# models:
# available options are:
@@ -35,7 +35,7 @@
MODEL = default
# parameters describing the model
-OCEANS = .false.
+APPROXIMATE_OCEAN_LOAD = .false.
TOPOGRAPHY = .false.
ATTENUATION = .false.
ANISOTROPY = .false.
@@ -55,11 +55,11 @@
ABSORB_INSTEAD_OF_FREE_SURFACE = .false.
# C-PML boundary conditions for a regional simulation
-PML_CONDITIONS = .false.
+PML_CONDITIONS = .false.
# C-PML top surface
PML_INSTEAD_OF_FREE_SURFACE = .false.
-
+
# C-PML thickness min/max
PML_WIDTH_MIN = 10000.0d0
PML_WIDTH_MAX = 25000.0d0
@@ -67,7 +67,7 @@
# C-PML dominant frequency
f0_FOR_PML = 12.7
-# parameters used to rotate C-PML boundary conditions by a given angle (not completed yet)
+# parameters used to rotate C-PML boundary conditions by a given angle (not completed yet)
# ROTATE_PML_ACTIVATE = .false.
# ROTATE_PML_ANGLE = 0.
@@ -112,7 +112,7 @@
# its norm is ignored and the norm of the force used is the factor force source times the source time function.
USE_FORCE_POINT_SOURCE = .false.
-# set to true to use a Ricker source time function instead of the source time functions set by default
+# set to true to use a Ricker source time function instead of the source time functions set by default
# to represent a (tilted) FORCESOLUTION force point source or a CMTSOLUTION moment-tensor source.
USE_RICKER_TIME_FUNCTION = .false.
Modified: seismo/3D/SPECFEM3D/trunk/examples/tpv16/DATA/Par_file_faults
===================================================================
--- seismo/3D/SPECFEM3D/trunk/examples/tpv16/DATA/Par_file_faults 2013-03-13 00:00:35 UTC (rev 21517)
+++ seismo/3D/SPECFEM3D/trunk/examples/tpv16/DATA/Par_file_faults 2013-03-13 00:23:42 UTC (rev 21518)
@@ -1,16 +1,16 @@
1
0.00134 ! #tag #eta(damping) FAULT A
1 ! 1 = dyn 2=kin
-1000 ! NTOUT : Number of time steps
+1000 ! NTOUT : Number of time steps
200 ! NTSNAP: time interation of snapshots
-1e0 ! V_HEALING (-1 : Healing off)
1e-3 ! V_RUPT
&BEGIN_FAULT /
-&INIT_STRESS S1=50.0e6,S2=0.0e0,S3=80.0e9,n1=0,n2=0,n3=0 /
+&INIT_STRESS S1=50.0e6,S2=0.0e0,S3=80.0e9,n1=0,n2=0,n3=0 /
-&SWF mus=0.677e0,mud=0.525e0,dc=0.5e0,nmus=0,nmud=0,ndc=0 /
+&SWF mus=0.677e0,mud=0.525e0,dc=0.5e0,nmus=0,nmud=0,ndc=0 /
&KINPAR kindt=1.0e0 /
Modified: seismo/3D/SPECFEM3D/trunk/examples/tpv5/DATA/Par_file
===================================================================
--- seismo/3D/SPECFEM3D/trunk/examples/tpv5/DATA/Par_file 2013-03-13 00:00:35 UTC (rev 21517)
+++ seismo/3D/SPECFEM3D/trunk/examples/tpv5/DATA/Par_file 2013-03-13 00:23:42 UTC (rev 21518)
@@ -23,7 +23,7 @@
# If you use our internal mesher, the only option is 8-node bricks (27-node elements are not supported)
# CUBIT does not support HEX27 elements either (it can generate them, but they are flat, i.e. identical to HEX8).
# To generate HEX27 elements with curvature properly taken into account, you can use Gmsh http://geuz.org/gmsh/
-NGNOD = 8
+NGNOD = 8
# models:
# available options are:
@@ -35,7 +35,7 @@
MODEL = default
# parameters describing the model
-OCEANS = .false.
+APPROXIMATE_OCEAN_LOAD = .false.
TOPOGRAPHY = .false.
ATTENUATION = .false.
ANISOTROPY = .false.
@@ -55,11 +55,11 @@
ABSORB_INSTEAD_OF_FREE_SURFACE = .false.
# C-PML boundary conditions for a regional simulation
-PML_CONDITIONS = .false.
+PML_CONDITIONS = .false.
# C-PML top surface
PML_INSTEAD_OF_FREE_SURFACE = .false.
-
+
# C-PML thickness min/max
PML_WIDTH_MIN = 10000.0d0
PML_WIDTH_MAX = 25000.0d0
@@ -67,7 +67,7 @@
# C-PML dominant frequency
f0_FOR_PML = 12.7
-# parameters used to rotate C-PML boundary conditions by a given angle (not completed yet)
+# parameters used to rotate C-PML boundary conditions by a given angle (not completed yet)
# ROTATE_PML_ACTIVATE = .false.
# ROTATE_PML_ANGLE = 0.
@@ -112,7 +112,7 @@
# its norm is ignored and the norm of the force used is the factor force source times the source time function.
USE_FORCE_POINT_SOURCE = .false.
-# set to true to use a Ricker source time function instead of the source time functions set by default
+# set to true to use a Ricker source time function instead of the source time functions set by default
# to represent a (tilted) FORCESOLUTION force point source or a CMTSOLUTION moment-tensor source.
USE_RICKER_TIME_FUNCTION = .false.
Modified: seismo/3D/SPECFEM3D/trunk/examples/tpv5/DATA/Par_file_faults
===================================================================
--- seismo/3D/SPECFEM3D/trunk/examples/tpv5/DATA/Par_file_faults 2013-03-13 00:00:35 UTC (rev 21517)
+++ seismo/3D/SPECFEM3D/trunk/examples/tpv5/DATA/Par_file_faults 2013-03-13 00:23:42 UTC (rev 21518)
@@ -1,7 +1,7 @@
1
0.00134 ! #tag #eta(damping)
1 ! 1 = dyn 2=kin
-1000 ! NTOUT : Number of time steps
+1000 ! NTOUT : Number of time steps
100 ! NTSNAP: time interation of snapshots
-1.0e0 ! V_HEALING (-1 : Healing off)
1e-3 ! V_RUPT
@@ -10,5 +10,5 @@
&DIST2D shape='square', val = 78.0e6, xc = -7500.0e0, yc =0e0, zc= -7500.0e0, l=3000.0e0 /
&DIST2D shape='square', val = 81.6e6, xc = 0e0, yc =0e0, zc= -7500.0e0, l=3000.0e0 /
&DIST2D shape='square', val = 62.0e6, xc = 7500.0e0, yc =0e0, zc= -7500.0e0, l=3000.0e0 /
-&SWF mus=10000.0e0, nmus=1, mud=0.525e0,dc=0.4e0/
-&DIST2D shape='rectangle', val = 0.677e0, xc = 0e0, yc =0e0, zc= -7500.0e0, lx=30000.0e0, ly=1.0e0, lz=15000.0e0 /
+&SWF mus=10000.0e0, nmus=1, mud=0.525e0,dc=0.4e0/
+&DIST2D shape='rectangle', val = 0.677e0, xc = 0e0, yc =0e0, zc= -7500.0e0, lx=30000.0e0, ly=1.0e0, lz=15000.0e0 /
Modified: seismo/3D/SPECFEM3D/trunk/examples/waterlayered_halfspace/DATA/Par_file
===================================================================
--- seismo/3D/SPECFEM3D/trunk/examples/waterlayered_halfspace/DATA/Par_file 2013-03-13 00:00:35 UTC (rev 21517)
+++ seismo/3D/SPECFEM3D/trunk/examples/waterlayered_halfspace/DATA/Par_file 2013-03-13 00:23:42 UTC (rev 21518)
@@ -23,7 +23,7 @@
# If you use our internal mesher, the only option is 8-node bricks (27-node elements are not supported)
# CUBIT does not support HEX27 elements either (it can generate them, but they are flat, i.e. identical to HEX8).
# To generate HEX27 elements with curvature properly taken into account, you can use Gmsh http://geuz.org/gmsh/
-NGNOD = 8
+NGNOD = 8
# models:
# available options are:
@@ -35,7 +35,7 @@
MODEL = default
# parameters describing the model
-OCEANS = .false.
+APPROXIMATE_OCEAN_LOAD = .false.
TOPOGRAPHY = .false.
ATTENUATION = .false.
ANISOTROPY = .false.
@@ -55,7 +55,7 @@
ABSORB_INSTEAD_OF_FREE_SURFACE = .false.
# C-PML boundary conditions for a regional simulation
-PML_CONDITIONS = .false.
+PML_CONDITIONS = .false.
# C-PML top surface
PML_INSTEAD_OF_FREE_SURFACE = .false.
@@ -67,7 +67,7 @@
# C-PML dominant frequency
f0_FOR_PML = 12.7
-# parameters used to rotate C-PML boundary conditions by a given angle (not completed yet)
+# parameters used to rotate C-PML boundary conditions by a given angle (not completed yet)
# ROTATE_PML_ACTIVATE = .false.
# ROTATE_PML_ANGLE = 0.
@@ -97,7 +97,7 @@
# interval in time steps for reading adjoint traces
# 0 = read the whole adjoint sources at the same time
-NTSTEP_BETWEEN_READ_ADJSRC = 0
+NTSTEP_BETWEEN_READ_ADJSRC = 0
# use a (tilted) FORCESOLUTION force point source (or several) instead of a CMTSOLUTION moment-tensor source.
# This can be useful e.g. for oil industry foothills simulations or asteroid simulations
@@ -112,7 +112,7 @@
# its norm is ignored and the norm of the force used is the factor force source times the source time function.
USE_FORCE_POINT_SOURCE = .false.
-# set to true to use a Ricker source time function instead of the source time functions set by default
+# set to true to use a Ricker source time function instead of the source time functions set by default
# to represent a (tilted) FORCESOLUTION force point source or a CMTSOLUTION moment-tensor source.
USE_RICKER_TIME_FUNCTION = .false.
Modified: seismo/3D/SPECFEM3D/trunk/src/cuda/compute_coupling_cuda.cu
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/cuda/compute_coupling_cuda.cu 2013-03-13 00:00:35 UTC (rev 21517)
+++ seismo/3D/SPECFEM3D/trunk/src/cuda/compute_coupling_cuda.cu 2013-03-13 00:23:42 UTC (rev 21518)
@@ -342,7 +342,7 @@
/* ----------------------------------------------------------------------------------------------- */
-/* OCEANS load on free surface */
+/* APPROXIMATE_OCEAN_LOAD load on free surface */
/* ----------------------------------------------------------------------------------------------- */
Modified: seismo/3D/SPECFEM3D/trunk/src/cuda/it_update_displacement_cuda.cu
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/cuda/it_update_displacement_cuda.cu 2013-03-13 00:00:35 UTC (rev 21517)
+++ seismo/3D/SPECFEM3D/trunk/src/cuda/it_update_displacement_cuda.cu 2013-03-13 00:23:42 UTC (rev 21518)
@@ -302,7 +302,7 @@
int* size_F,
realw* deltatover2_F,
realw* b_deltatover2_F,
- int* OCEANS) {
+ int* APPROXIMATE_OCEAN_LOAD) {
TRACE("kernel_3_a_cuda");
Mesh* mp = (Mesh*)(*Mesh_pointer); // get Mesh from fortran integer wrapper
@@ -326,7 +326,7 @@
dim3 threads(blocksize,1,1);
// check whether we can update accel and veloc, or only accel at this point
- if( *OCEANS == 0 ){
+ if( *APPROXIMATE_OCEAN_LOAD == 0 ){
// updates both, accel and veloc
kernel_3_cuda_device<<< grid, threads,0,mp->compute_stream>>>(mp->d_veloc,
mp->d_accel,
Modified: seismo/3D/SPECFEM3D/trunk/src/cuda/prepare_mesh_constants_cuda.cu
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/cuda/prepare_mesh_constants_cuda.cu 2013-03-13 00:00:35 UTC (rev 21517)
+++ seismo/3D/SPECFEM3D/trunk/src/cuda/prepare_mesh_constants_cuda.cu 2013-03-13 00:23:42 UTC (rev 21518)
@@ -665,7 +665,7 @@
realw* R_xx,realw* R_yy,realw* R_xy,realw* R_xz,realw* R_yz,
realw* one_minus_sum_beta,realw* factor_common,
realw* alphaval,realw* betaval,realw* gammaval,
- int* OCEANS,
+ int* APPROXIMATE_OCEAN_LOAD,
realw* rmass_ocean_load,
int* NOISE_TOMOGRAPHY,
realw* free_surface_normal,
@@ -1029,7 +1029,7 @@
}
// ocean load approximation
- if( *OCEANS ){
+ if( *APPROXIMATE_OCEAN_LOAD ){
// oceans needs a free surface
mp->num_free_surface_faces = *num_free_surface_faces;
if( mp->num_free_surface_faces > 0 ){
@@ -1519,7 +1519,7 @@
int* COMPUTE_AND_STORE_STRAIN,
int* ATTENUATION,
int* ANISOTROPY,
- int* OCEANS,
+ int* APPROXIMATE_OCEAN_LOAD,
int* APPROXIMATE_HESS_KL) {
TRACE("prepare_cleanup_device");
@@ -1706,7 +1706,7 @@
cudaFree(mp->d_c66store);
}
- if( *OCEANS ){
+ if( *APPROXIMATE_OCEAN_LOAD ){
if( mp->num_free_surface_faces > 0 ){
cudaFree(mp->d_rmass_ocean_load);
cudaFree(mp->d_free_surface_normal);
Modified: seismo/3D/SPECFEM3D/trunk/src/cuda/specfem3D_gpu_cuda_method_stubs.c
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/cuda/specfem3D_gpu_cuda_method_stubs.c 2013-03-13 00:00:35 UTC (rev 21517)
+++ seismo/3D/SPECFEM3D/trunk/src/cuda/specfem3D_gpu_cuda_method_stubs.c 2013-03-13 00:23:42 UTC (rev 21518)
@@ -358,7 +358,7 @@
int* size_F,
realw* deltatover2_F,
realw* b_deltatover2_F,
- int* OCEANS) {}
+ int* APPROXIMATE_OCEAN_LOAD) {}
void FC_FUNC_(kernel_3_b_cuda,
KERNEL_3_B_CUDA)(long* Mesh_pointer,
@@ -494,7 +494,7 @@
realw* R_xx,realw* R_yy,realw* R_xy,realw* R_xz,realw* R_yz,
realw* one_minus_sum_beta,realw* factor_common,
realw* alphaval,realw* betaval,realw* gammaval,
- int* OCEANS,
+ int* APPROXIMATE_OCEAN_LOAD,
realw* rmass_ocean_load,
int* NOISE_TOMOGRAPHY,
realw* free_surface_normal,
@@ -588,7 +588,7 @@
int* COMPUTE_AND_STORE_STRAIN,
int* ATTENUATION,
int* ANISOTROPY,
- int* OCEANS,
+ int* APPROXIMATE_OCEAN_LOAD,
int* APPROXIMATE_HESS_KL) {}
Modified: seismo/3D/SPECFEM3D/trunk/src/decompose_mesh/decompose_mesh.F90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/decompose_mesh/decompose_mesh.F90 2013-03-13 00:00:35 UTC (rev 21517)
+++ seismo/3D/SPECFEM3D/trunk/src/decompose_mesh/decompose_mesh.F90 2013-03-13 00:23:42 UTC (rev 21518)
@@ -149,7 +149,7 @@
logical :: MOVIE_SURFACE,MOVIE_VOLUME,CREATE_SHAKEMAP,SAVE_DISPLACEMENT, &
USE_HIGHRES_FOR_MOVIES,SUPPRESS_UTM_PROJECTION
logical :: ATTENUATION,USE_OLSEN_ATTENUATION,PML_CONDITIONS,PML_INSTEAD_OF_FREE_SURFACE, &
- OCEANS,TOPOGRAPHY,USE_FORCE_POINT_SOURCE
+ APPROXIMATE_OCEAN_LOAD,TOPOGRAPHY,USE_FORCE_POINT_SOURCE
logical :: ABSORBING_CONDITIONS,SAVE_FORWARD,ABSORB_INSTEAD_OF_FREE_SURFACE
logical :: ANISOTROPY,SAVE_MESH_FILES,USE_RICKER_TIME_FUNCTION,PRINT_SOURCE_TIME_FUNCTION
character(len=256) LOCAL_PATH,TOMOGRAPHY_PATH
Modified: seismo/3D/SPECFEM3D/trunk/src/decompose_mesh/program_decompose_mesh.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/decompose_mesh/program_decompose_mesh.f90 2013-03-13 00:00:35 UTC (rev 21517)
+++ seismo/3D/SPECFEM3D/trunk/src/decompose_mesh/program_decompose_mesh.f90 2013-03-13 00:23:42 UTC (rev 21518)
@@ -39,7 +39,7 @@
MOVIE_SURFACE,MOVIE_VOLUME,CREATE_SHAKEMAP,SAVE_DISPLACEMENT, &
USE_HIGHRES_FOR_MOVIES,SUPPRESS_UTM_PROJECTION, &
ATTENUATION,USE_OLSEN_ATTENUATION, &
- OCEANS,TOPOGRAPHY,USE_FORCE_POINT_SOURCE, &
+ APPROXIMATE_OCEAN_LOAD,TOPOGRAPHY,USE_FORCE_POINT_SOURCE, &
ABSORBING_CONDITIONS,SAVE_FORWARD,ABSORB_INSTEAD_OF_FREE_SURFACE, &
ANISOTROPY,SAVE_MESH_FILES,USE_RICKER_TIME_FUNCTION,PRINT_SOURCE_TIME_FUNCTION, &
LOCAL_PATH,TOMOGRAPHY_PATH,PML_CONDITIONS,PML_INSTEAD_OF_FREE_SURFACE, &
@@ -73,7 +73,7 @@
call read_parameter_file( NPROC,NTSTEP_BETWEEN_OUTPUT_SEISMOS,NSTEP,DT,NGNOD,NGNOD2D, &
UTM_PROJECTION_ZONE,SUPPRESS_UTM_PROJECTION,TOMOGRAPHY_PATH, &
ATTENUATION,USE_OLSEN_ATTENUATION,LOCAL_PATH,NSOURCES, &
- OCEANS,TOPOGRAPHY,ANISOTROPY,ABSORBING_CONDITIONS,MOVIE_TYPE, &
+ APPROXIMATE_OCEAN_LOAD,TOPOGRAPHY,ANISOTROPY,ABSORBING_CONDITIONS,MOVIE_TYPE, &
MOVIE_SURFACE,MOVIE_VOLUME,CREATE_SHAKEMAP,SAVE_DISPLACEMENT, &
NTSTEP_BETWEEN_FRAMES,USE_HIGHRES_FOR_MOVIES,HDUR_MOVIE, &
SAVE_MESH_FILES,PRINT_SOURCE_TIME_FUNCTION, &
Modified: seismo/3D/SPECFEM3D/trunk/src/generate_databases/create_mass_matrices.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/generate_databases/create_mass_matrices.f90 2013-03-13 00:00:35 UTC (rev 21517)
+++ seismo/3D/SPECFEM3D/trunk/src/generate_databases/create_mass_matrices.f90 2013-03-13 00:23:42 UTC (rev 21518)
@@ -185,7 +185,7 @@
! returns precomputed mass matrix in rmass array
use generate_databases_par, only: &
- OCEANS,TOPOGRAPHY,UTM_PROJECTION_ZONE,SUPPRESS_UTM_PROJECTION, &
+ APPROXIMATE_OCEAN_LOAD,TOPOGRAPHY,UTM_PROJECTION_ZONE,SUPPRESS_UTM_PROJECTION, &
NX_TOPO,NY_TOPO,itopo_bathy,myrank
use create_regions_mesh_ext_par
@@ -209,7 +209,7 @@
real(kind=CUSTOM_REAL) :: xloc,yloc,loc_elevation
! creates ocean load mass matrix
- if(OCEANS) then
+ if(APPROXIMATE_OCEAN_LOAD) then
if( myrank == 0) then
write(IMAIN,*) ' ...creating ocean load mass matrix '
@@ -269,7 +269,7 @@
! take into account inertia of water column
weight = dble( free_surface_jacobian2Dw(igll,ispec2D)) &
- * dble(RHO_OCEANS) * height_oceans
+ * dble(RHO_APPROXIMATE_OCEAN_LOAD) * height_oceans
! distinguish between single and double precision for reals
if(CUSTOM_REAL == SIZE_REAL) then
Modified: seismo/3D/SPECFEM3D/trunk/src/generate_databases/create_regions_mesh.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/generate_databases/create_regions_mesh.f90 2013-03-13 00:00:35 UTC (rev 21517)
+++ seismo/3D/SPECFEM3D/trunk/src/generate_databases/create_regions_mesh.f90 2013-03-13 00:23:42 UTC (rev 21518)
@@ -46,7 +46,7 @@
nodes_ibelm_xmin,nodes_ibelm_xmax,nodes_ibelm_ymin,nodes_ibelm_ymax,&
nodes_ibelm_bottom,nodes_ibelm_top, &
SAVE_MESH_FILES,PML_CONDITIONS, &
- ANISOTROPY,NPROC,OCEANS,OLSEN_ATTENUATION_RATIO, &
+ ANISOTROPY,NPROC,APPROXIMATE_OCEAN_LOAD,OLSEN_ATTENUATION_RATIO, &
ATTENUATION,USE_OLSEN_ATTENUATION, &
nspec2D_moho_ext,ibelm_moho,nodes_ibelm_moho
@@ -236,7 +236,7 @@
write(IMAIN,*) ' ...saving databases'
endif
!call create_name_database(prname,myrank,LOCAL_PATH)
- call save_arrays_solver_ext_mesh(nspec,nglob_dummy,OCEANS,ibool, &
+ call save_arrays_solver_ext_mesh(nspec,nglob_dummy,APPROXIMATE_OCEAN_LOAD,ibool, &
num_interfaces_ext_mesh,my_neighbours_ext_mesh,nibool_interfaces_ext_mesh, &
max_interface_size_ext_mesh,ibool_interfaces_ext_mesh, &
SAVE_MESH_FILES,ANISOTROPY)
@@ -252,7 +252,7 @@
! computes the approximate amount of memory needed to run the solver
call sync_all()
call memory_eval(nspec,nglob_dummy,maxval(nibool_interfaces_ext_mesh),num_interfaces_ext_mesh, &
- OCEANS,memory_size)
+ APPROXIMATE_OCEAN_LOAD,memory_size)
call max_all_dp(memory_size, max_memory_size)
! checks the mesh, stability and resolved period
Modified: seismo/3D/SPECFEM3D/trunk/src/generate_databases/generate_databases.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/generate_databases/generate_databases.f90 2013-03-13 00:00:35 UTC (rev 21517)
+++ seismo/3D/SPECFEM3D/trunk/src/generate_databases/generate_databases.f90 2013-03-13 00:23:42 UTC (rev 21518)
@@ -257,7 +257,7 @@
call read_parameter_file( NPROC,NTSTEP_BETWEEN_OUTPUT_SEISMOS,NSTEP,DT,NGNOD,NGNOD2D, &
UTM_PROJECTION_ZONE,SUPPRESS_UTM_PROJECTION,TOMOGRAPHY_PATH, &
ATTENUATION,USE_OLSEN_ATTENUATION,LOCAL_PATH,NSOURCES, &
- OCEANS,TOPOGRAPHY,ANISOTROPY,ABSORBING_CONDITIONS,MOVIE_TYPE, &
+ APPROXIMATE_OCEAN_LOAD,TOPOGRAPHY,ANISOTROPY,ABSORBING_CONDITIONS,MOVIE_TYPE, &
MOVIE_SURFACE,MOVIE_VOLUME,CREATE_SHAKEMAP,SAVE_DISPLACEMENT, &
NTSTEP_BETWEEN_FRAMES,USE_HIGHRES_FOR_MOVIES,HDUR_MOVIE, &
SAVE_MESH_FILES,PRINT_SOURCE_TIME_FUNCTION, &
@@ -381,7 +381,7 @@
endif
write(IMAIN,*)
- if(OCEANS) then
+ if(APPROXIMATE_OCEAN_LOAD) then
write(IMAIN,*) 'incorporating the oceans using equivalent load'
if(TOPOGRAPHY) write(IMAIN,*) ' with elevation from topography file'
else
@@ -434,7 +434,7 @@
use generate_databases_par
implicit none
- if( OCEANS .and. TOPOGRAPHY ) then
+ if( APPROXIMATE_OCEAN_LOAD .and. TOPOGRAPHY ) then
! values given in constants.h
NX_TOPO = NX_TOPO_FILE
Modified: seismo/3D/SPECFEM3D/trunk/src/generate_databases/generate_databases_par.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/generate_databases/generate_databases_par.f90 2013-03-13 00:00:35 UTC (rev 21517)
+++ seismo/3D/SPECFEM3D/trunk/src/generate_databases/generate_databases_par.f90 2013-03-13 00:23:42 UTC (rev 21518)
@@ -61,7 +61,7 @@
double precision :: DT,HDUR_MOVIE,OLSEN_ATTENUATION_RATIO,f0_FOR_PML,PML_WIDTH_MIN,PML_WIDTH_MAX
- logical :: ATTENUATION,USE_OLSEN_ATTENUATION,OCEANS,TOPOGRAPHY,SAVE_FORWARD,USE_FORCE_POINT_SOURCE
+ logical :: ATTENUATION,USE_OLSEN_ATTENUATION,APPROXIMATE_OCEAN_LOAD,TOPOGRAPHY,SAVE_FORWARD,USE_FORCE_POINT_SOURCE
logical :: ANISOTROPY,ABSORBING_CONDITIONS,SAVE_MESH_FILES,ABSORB_INSTEAD_OF_FREE_SURFACE
logical :: PML_CONDITIONS,PML_INSTEAD_OF_FREE_SURFACE
logical :: USE_RICKER_TIME_FUNCTION,PRINT_SOURCE_TIME_FUNCTION
Modified: seismo/3D/SPECFEM3D/trunk/src/generate_databases/memory_eval.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/generate_databases/memory_eval.f90 2013-03-13 00:00:35 UTC (rev 21517)
+++ seismo/3D/SPECFEM3D/trunk/src/generate_databases/memory_eval.f90 2013-03-13 00:23:42 UTC (rev 21518)
@@ -30,7 +30,7 @@
! compute the approximate amount of memory needed to run the solver
subroutine memory_eval(NSPEC_AB,NGLOB_AB,max_nibool_interfaces_ext_mesh,num_interfaces_ext_mesh,&
- OCEANS,memory_size)
+ APPROXIMATE_OCEAN_LOAD,memory_size)
use generate_databases_par, only: PML_CONDITIONS,nspec_cpml
use create_regions_mesh_ext_par,only: NSPEC_ANISO,ispec_is_acoustic,ispec_is_elastic
@@ -42,7 +42,7 @@
! input
integer, intent(in) :: NSPEC_AB,NGLOB_AB
integer, intent(in) :: max_nibool_interfaces_ext_mesh,num_interfaces_ext_mesh
- logical, intent(in) :: OCEANS
+ logical, intent(in) :: APPROXIMATE_OCEAN_LOAD
! output
double precision, intent(out) :: memory_size
! local parameters
@@ -151,7 +151,7 @@
! c11store,...c66store
memory_size = memory_size + 21.d0*dble(NGLLX)*dble(NGLLY)*dble(NGLLZ)*NSPEC_ANISO*dble(CUSTOM_REAL)
- if (OCEANS ) then
+ if (APPROXIMATE_OCEAN_LOAD ) then
! rmass_ocean_load
memory_size = memory_size + NGLOB_AB*dble(CUSTOM_REAL)
! updated_dof_ocean_load
Modified: seismo/3D/SPECFEM3D/trunk/src/generate_databases/save_arrays_solver.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/generate_databases/save_arrays_solver.f90 2013-03-13 00:00:35 UTC (rev 21517)
+++ seismo/3D/SPECFEM3D/trunk/src/generate_databases/save_arrays_solver.f90 2013-03-13 00:23:42 UTC (rev 21518)
@@ -27,7 +27,7 @@
! for external mesh
- subroutine save_arrays_solver_ext_mesh(nspec,nglob,OCEANS,ibool, &
+ subroutine save_arrays_solver_ext_mesh(nspec,nglob,APPROXIMATE_OCEAN_LOAD,ibool, &
num_interfaces_ext_mesh,my_neighbours_ext_mesh,nibool_interfaces_ext_mesh, &
max_interface_size_ext_mesh,ibool_interfaces_ext_mesh, &
SAVE_MESH_FILES,ANISOTROPY)
@@ -42,7 +42,7 @@
integer :: nspec,nglob
! ocean load
- logical :: OCEANS
+ logical :: APPROXIMATE_OCEAN_LOAD
! mesh coordinates
integer, dimension(NGLLX,NGLLY,NGLLZ,nspec) :: ibool
! MPI interfaces
@@ -103,7 +103,7 @@
! elastic
if( ELASTIC_SIMULATION ) then
write(IOUT) rmass
- if( OCEANS) then
+ if( APPROXIMATE_OCEAN_LOAD) then
write(IOUT) rmass_ocean_load
endif
!pll Stacey
Modified: seismo/3D/SPECFEM3D/trunk/src/meshfem3D/check_mesh_quality.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/meshfem3D/check_mesh_quality.f90 2013-03-13 00:00:35 UTC (rev 21517)
+++ seismo/3D/SPECFEM3D/trunk/src/meshfem3D/check_mesh_quality.f90 2013-03-13 00:23:42 UTC (rev 21518)
@@ -103,7 +103,7 @@
double precision DT
double precision HDUR_MOVIE,OLSEN_ATTENUATION_RATIO,f0_FOR_PML,PML_WIDTH_MIN,PML_WIDTH_MAX
logical ATTENUATION,USE_OLSEN_ATTENUATION, &
- OCEANS,TOPOGRAPHY,USE_FORCE_POINT_SOURCE
+ APPROXIMATE_OCEAN_LOAD,TOPOGRAPHY,USE_FORCE_POINT_SOURCE
logical ABSORBING_CONDITIONS,SAVE_FORWARD,ABSORB_INSTEAD_OF_FREE_SURFACE
logical ANISOTROPY,SAVE_MESH_FILES,USE_RICKER_TIME_FUNCTION,PRINT_SOURCE_TIME_FUNCTION
logical PML_CONDITIONS,PML_INSTEAD_OF_FREE_SURFACE
@@ -124,7 +124,7 @@
call read_parameter_file( NPROC,NTSTEP_BETWEEN_OUTPUT_SEISMOS,NSTEP,DT,NGNOD,NGNOD2D, &
UTM_PROJECTION_ZONE,SUPPRESS_UTM_PROJECTION,TOMOGRAPHY_PATH, &
ATTENUATION,USE_OLSEN_ATTENUATION,LOCAL_PATH,NSOURCES, &
- OCEANS,TOPOGRAPHY,ANISOTROPY,ABSORBING_CONDITIONS,MOVIE_TYPE, &
+ APPROXIMATE_OCEAN_LOAD,TOPOGRAPHY,ANISOTROPY,ABSORBING_CONDITIONS,MOVIE_TYPE, &
MOVIE_SURFACE,MOVIE_VOLUME,CREATE_SHAKEMAP,SAVE_DISPLACEMENT, &
NTSTEP_BETWEEN_FRAMES,USE_HIGHRES_FOR_MOVIES,HDUR_MOVIE, &
SAVE_MESH_FILES,PRINT_SOURCE_TIME_FUNCTION, &
Modified: seismo/3D/SPECFEM3D/trunk/src/meshfem3D/meshfem3D.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/meshfem3D/meshfem3D.f90 2013-03-13 00:00:35 UTC (rev 21517)
+++ seismo/3D/SPECFEM3D/trunk/src/meshfem3D/meshfem3D.f90 2013-03-13 00:23:42 UTC (rev 21518)
@@ -336,7 +336,7 @@
double precision DT
double precision HDUR_MOVIE,OLSEN_ATTENUATION_RATIO,f0_FOR_PML
logical ATTENUATION,USE_OLSEN_ATTENUATION, &
- OCEANS,TOPOGRAPHY,USE_FORCE_POINT_SOURCE
+ APPROXIMATE_OCEAN_LOAD,TOPOGRAPHY,USE_FORCE_POINT_SOURCE
logical ABSORBING_CONDITIONS,SAVE_FORWARD,ABSORB_INSTEAD_OF_FREE_SURFACE
logical ANISOTROPY,SAVE_MESH_FILES,USE_RICKER_TIME_FUNCTION,PRINT_SOURCE_TIME_FUNCTION
logical PML_CONDITIONS,PML_INSTEAD_OF_FREE_SURFACE
@@ -374,7 +374,7 @@
call read_parameter_file( NPROC,NTSTEP_BETWEEN_OUTPUT_SEISMOS,NSTEP,DT,NGNOD,NGNOD2D, &
UTM_PROJECTION_ZONE,SUPPRESS_UTM_PROJECTION,TOMOGRAPHY_PATH, &
ATTENUATION,USE_OLSEN_ATTENUATION,LOCAL_PATH,NSOURCES, &
- OCEANS,TOPOGRAPHY,ANISOTROPY,ABSORBING_CONDITIONS,MOVIE_TYPE, &
+ APPROXIMATE_OCEAN_LOAD,TOPOGRAPHY,ANISOTROPY,ABSORBING_CONDITIONS,MOVIE_TYPE, &
MOVIE_SURFACE,MOVIE_VOLUME,CREATE_SHAKEMAP,SAVE_DISPLACEMENT, &
NTSTEP_BETWEEN_FRAMES,USE_HIGHRES_FOR_MOVIES,HDUR_MOVIE, &
SAVE_MESH_FILES,PRINT_SOURCE_TIME_FUNCTION, &
Modified: seismo/3D/SPECFEM3D/trunk/src/shared/combine_vol_data.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/shared/combine_vol_data.f90 2013-03-13 00:00:35 UTC (rev 21517)
+++ seismo/3D/SPECFEM3D/trunk/src/shared/combine_vol_data.f90 2013-03-13 00:23:42 UTC (rev 21518)
@@ -97,7 +97,7 @@
logical :: MOVIE_SURFACE,MOVIE_VOLUME,CREATE_SHAKEMAP,SAVE_DISPLACEMENT, &
USE_HIGHRES_FOR_MOVIES,SUPPRESS_UTM_PROJECTION
logical :: ATTENUATION,USE_OLSEN_ATTENUATION, &
- OCEANS,TOPOGRAPHY,USE_FORCE_POINT_SOURCE
+ APPROXIMATE_OCEAN_LOAD,TOPOGRAPHY,USE_FORCE_POINT_SOURCE
logical :: ABSORBING_CONDITIONS,SAVE_FORWARD,ABSORB_INSTEAD_OF_FREE_SURFACE
logical :: ANISOTROPY,SAVE_MESH_FILES,USE_RICKER_TIME_FUNCTION,PRINT_SOURCE_TIME_FUNCTION
logical :: PML_CONDITIONS,PML_INSTEAD_OF_FREE_SURFACE
@@ -177,7 +177,7 @@
call read_parameter_file( NPROC,NTSTEP_BETWEEN_OUTPUT_SEISMOS,NSTEP,DT,NGNOD,NGNOD2D, &
UTM_PROJECTION_ZONE,SUPPRESS_UTM_PROJECTION,TOMOGRAPHY_PATH, &
ATTENUATION,USE_OLSEN_ATTENUATION,LOCAL_PATH,NSOURCES, &
- OCEANS,TOPOGRAPHY,ANISOTROPY,ABSORBING_CONDITIONS,MOVIE_TYPE, &
+ APPROXIMATE_OCEAN_LOAD,TOPOGRAPHY,ANISOTROPY,ABSORBING_CONDITIONS,MOVIE_TYPE, &
MOVIE_SURFACE,MOVIE_VOLUME,CREATE_SHAKEMAP,SAVE_DISPLACEMENT, &
NTSTEP_BETWEEN_FRAMES,USE_HIGHRES_FOR_MOVIES,HDUR_MOVIE, &
SAVE_MESH_FILES,PRINT_SOURCE_TIME_FUNCTION, &
Modified: seismo/3D/SPECFEM3D/trunk/src/shared/constants.h.in
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/shared/constants.h.in 2013-03-13 00:00:35 UTC (rev 21517)
+++ seismo/3D/SPECFEM3D/trunk/src/shared/constants.h.in 2013-03-13 00:23:42 UTC (rev 21518)
@@ -137,17 +137,17 @@
!!-----------------------------------------------------------
!!
-!! C-PML absorbing boundary conditions
+!! C-PML absorbing boundary conditions
!!
!!-----------------------------------------------------------
real(kind=CUSTOM_REAL), parameter :: NPOWER = 1.d0
- real(kind=CUSTOM_REAL), parameter :: K_MAX_PML = 1.d0 ! (Martin and Komatitsch, Geophys. J. Int. 2009)
+ real(kind=CUSTOM_REAL), parameter :: K_MAX_PML = 1.d0 ! (Martin and Komatitsch, Geophys. J. Int. 2009)
-! C-PML theoretical reflection coefficient
+! C-PML theoretical reflection coefficient
! (INRIA research report section 6.1: http://hal.inria.fr/docs/00/07/32/19/PDF/RR-3471.pdf)
real(kind=CUSTOM_REAL), parameter :: CPML_Rcoef = 0.001d0
-! empirical damping modified factor
+! empirical damping modified factor
real(kind=CUSTOM_REAL), parameter :: damping_factor = 1.2d0
! absorb boundaries using a PML region
@@ -364,14 +364,14 @@
!!-----------------------------------------------------------
!!
-!! OCEANS load approximation
+!! APPROXIMATE_OCEAN_LOAD load approximation
!!
!!-----------------------------------------------------------
! minimum thickness in meters to include the effect of the oceans
! to avoid taking into account spurious oscillations in topography model
double precision, parameter :: MINIMUM_THICKNESS_3D_OCEANS = 10.d0
! density of sea water
- real(kind=CUSTOM_REAL), parameter :: RHO_OCEANS = 1020.0
+ real(kind=CUSTOM_REAL), parameter :: RHO_APPROXIMATE_OCEAN_LOAD = 1020.0
!!-----------------------------------------------------------
!!
Modified: seismo/3D/SPECFEM3D/trunk/src/shared/create_movie_shakemap_AVS_DX_GMT.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/shared/create_movie_shakemap_AVS_DX_GMT.f90 2013-03-13 00:00:35 UTC (rev 21517)
+++ seismo/3D/SPECFEM3D/trunk/src/shared/create_movie_shakemap_AVS_DX_GMT.f90 2013-03-13 00:23:42 UTC (rev 21518)
@@ -92,7 +92,7 @@
double precision DT
double precision HDUR_MOVIE,OLSEN_ATTENUATION_RATIO,f0_FOR_PML,PML_WIDTH_MIN,PML_WIDTH_MAX
logical ATTENUATION,USE_OLSEN_ATTENUATION, &
- OCEANS,TOPOGRAPHY,USE_FORCE_POINT_SOURCE
+ APPROXIMATE_OCEAN_LOAD,TOPOGRAPHY,USE_FORCE_POINT_SOURCE
logical ABSORBING_CONDITIONS,SAVE_FORWARD,ABSORB_INSTEAD_OF_FREE_SURFACE
logical ANISOTROPY,SAVE_MESH_FILES,USE_RICKER_TIME_FUNCTION,PRINT_SOURCE_TIME_FUNCTION
logical PML_CONDITIONS,PML_INSTEAD_OF_FREE_SURFACE
@@ -131,7 +131,7 @@
call read_parameter_file(NPROC,NTSTEP_BETWEEN_OUTPUT_SEISMOS,NSTEP,DT,NGNOD,NGNOD2D, &
UTM_PROJECTION_ZONE,SUPPRESS_UTM_PROJECTION,TOMOGRAPHY_PATH, &
ATTENUATION,USE_OLSEN_ATTENUATION,LOCAL_PATH,NSOURCES, &
- OCEANS,TOPOGRAPHY,ANISOTROPY,ABSORBING_CONDITIONS,MOVIE_TYPE, &
+ APPROXIMATE_OCEAN_LOAD,TOPOGRAPHY,ANISOTROPY,ABSORBING_CONDITIONS,MOVIE_TYPE, &
MOVIE_SURFACE,MOVIE_VOLUME,CREATE_SHAKEMAP,SAVE_DISPLACEMENT, &
NTSTEP_BETWEEN_FRAMES,USE_HIGHRES_FOR_MOVIES,HDUR_MOVIE, &
SAVE_MESH_FILES,PRINT_SOURCE_TIME_FUNCTION, &
Modified: seismo/3D/SPECFEM3D/trunk/src/shared/read_parameter_file.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/shared/read_parameter_file.f90 2013-03-13 00:00:35 UTC (rev 21517)
+++ seismo/3D/SPECFEM3D/trunk/src/shared/read_parameter_file.f90 2013-03-13 00:23:42 UTC (rev 21518)
@@ -27,7 +27,7 @@
subroutine read_parameter_file( NPROC,NTSTEP_BETWEEN_OUTPUT_SEISMOS,NSTEP,DT,NGNOD,NGNOD2D, &
UTM_PROJECTION_ZONE,SUPPRESS_UTM_PROJECTION,TOMOGRAPHY_PATH, &
ATTENUATION,USE_OLSEN_ATTENUATION,LOCAL_PATH,NSOURCES, &
- OCEANS,TOPOGRAPHY,ANISOTROPY,ABSORBING_CONDITIONS,MOVIE_TYPE, &
+ APPROXIMATE_OCEAN_LOAD,TOPOGRAPHY,ANISOTROPY,ABSORBING_CONDITIONS,MOVIE_TYPE, &
MOVIE_SURFACE,MOVIE_VOLUME,CREATE_SHAKEMAP,SAVE_DISPLACEMENT, &
NTSTEP_BETWEEN_FRAMES,USE_HIGHRES_FOR_MOVIES,HDUR_MOVIE, &
SAVE_MESH_FILES,PRINT_SOURCE_TIME_FUNCTION,NTSTEP_BETWEEN_OUTPUT_INFO, &
@@ -47,7 +47,7 @@
double precision DT,HDUR_MOVIE,OLSEN_ATTENUATION_RATIO,f0_FOR_PML,PML_WIDTH_MIN,PML_WIDTH_MAX
- logical ATTENUATION,USE_OLSEN_ATTENUATION,OCEANS,TOPOGRAPHY,ABSORBING_CONDITIONS,SAVE_FORWARD
+ logical ATTENUATION,USE_OLSEN_ATTENUATION,APPROXIMATE_OCEAN_LOAD,TOPOGRAPHY,ABSORBING_CONDITIONS,SAVE_FORWARD
logical MOVIE_SURFACE,MOVIE_VOLUME,CREATE_SHAKEMAP,SAVE_DISPLACEMENT,USE_HIGHRES_FOR_MOVIES
logical ANISOTROPY,SAVE_MESH_FILES,PRINT_SOURCE_TIME_FUNCTION,SUPPRESS_UTM_PROJECTION
logical USE_FORCE_POINT_SOURCE,ABSORB_INSTEAD_OF_FREE_SURFACE,USE_RICKER_TIME_FUNCTION
@@ -110,7 +110,7 @@
call read_value_string(MODEL, 'model.MODEL')
if(err_occurred() /= 0) stop 'an error occurred while reading the parameter file: MODEL'
- call read_value_logical(OCEANS, 'model.OCEANS')
+ call read_value_logical(APPROXIMATE_OCEAN_LOAD, 'model.APPROXIMATE_OCEAN_LOAD')
if(err_occurred() /= 0) return
call read_value_logical(TOPOGRAPHY, 'model.TOPOGRAPHY')
if(err_occurred() /= 0) return
Modified: seismo/3D/SPECFEM3D/trunk/src/shared/smooth_vol_data.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/shared/smooth_vol_data.f90 2013-03-13 00:00:35 UTC (rev 21517)
+++ seismo/3D/SPECFEM3D/trunk/src/shared/smooth_vol_data.f90 2013-03-13 00:23:42 UTC (rev 21518)
@@ -105,7 +105,7 @@
logical :: MOVIE_SURFACE,MOVIE_VOLUME,CREATE_SHAKEMAP,SAVE_DISPLACEMENT, &
USE_HIGHRES_FOR_MOVIES,SUPPRESS_UTM_PROJECTION
logical :: ATTENUATION,USE_OLSEN_ATTENUATION, &
- OCEANS,TOPOGRAPHY,USE_FORCE_POINT_SOURCE
+ APPROXIMATE_OCEAN_LOAD,TOPOGRAPHY,USE_FORCE_POINT_SOURCE
logical :: ABSORBING_CONDITIONS,SAVE_FORWARD,ABSORB_INSTEAD_OF_FREE_SURFACE
logical :: ANISOTROPY,SAVE_MESH_FILES,USE_RICKER_TIME_FUNCTION,PRINT_SOURCE_TIME_FUNCTION
logical :: PML_CONDITIONS,PML_INSTEAD_OF_FREE_SURFACE
@@ -215,7 +215,7 @@
call read_parameter_file( NPROC,NTSTEP_BETWEEN_OUTPUT_SEISMOS,NSTEP,DT,NGNOD,NGNOD2D, &
UTM_PROJECTION_ZONE,SUPPRESS_UTM_PROJECTION,TOMOGRAPHY_PATH, &
ATTENUATION,USE_OLSEN_ATTENUATION,LOCAL_PATH,NSOURCES, &
- OCEANS,TOPOGRAPHY,ANISOTROPY,ABSORBING_CONDITIONS,MOVIE_TYPE, &
+ APPROXIMATE_OCEAN_LOAD,TOPOGRAPHY,ANISOTROPY,ABSORBING_CONDITIONS,MOVIE_TYPE, &
MOVIE_SURFACE,MOVIE_VOLUME,CREATE_SHAKEMAP,SAVE_DISPLACEMENT, &
NTSTEP_BETWEEN_FRAMES,USE_HIGHRES_FOR_MOVIES,HDUR_MOVIE, &
SAVE_MESH_FILES,PRINT_SOURCE_TIME_FUNCTION, &
@@ -339,7 +339,7 @@
! elastic
if( ELASTIC_SIMULATION ) then
read(27) dummy_1 ! rmass
- if( OCEANS ) then
+ if( APPROXIMATE_OCEAN_LOAD ) then
read(27) dummy_1 ! rmass_ocean_load
endif
read(27) dummy ! rho_vp
Modified: seismo/3D/SPECFEM3D/trunk/src/shared/sum_kernels.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/shared/sum_kernels.f90 2013-03-13 00:00:35 UTC (rev 21517)
+++ seismo/3D/SPECFEM3D/trunk/src/shared/sum_kernels.f90 2013-03-13 00:23:42 UTC (rev 21518)
@@ -112,7 +112,7 @@
logical :: MOVIE_SURFACE,MOVIE_VOLUME,CREATE_SHAKEMAP,SAVE_DISPLACEMENT, &
USE_HIGHRES_FOR_MOVIES,SUPPRESS_UTM_PROJECTION
logical :: ATTENUATION,USE_OLSEN_ATTENUATION, &
- OCEANS,TOPOGRAPHY,USE_FORCE_POINT_SOURCE
+ APPROXIMATE_OCEAN_LOAD,TOPOGRAPHY,USE_FORCE_POINT_SOURCE
logical :: ABSORBING_CONDITIONS,SAVE_FORWARD,ABSORB_INSTEAD_OF_FREE_SURFACE
logical :: ANISOTROPY,SAVE_MESH_FILES,USE_RICKER_TIME_FUNCTION,PRINT_SOURCE_TIME_FUNCTION
logical :: PML_CONDITIONS,PML_INSTEAD_OF_FREE_SURFACE
@@ -154,7 +154,7 @@
call read_parameter_file( NPROC,NTSTEP_BETWEEN_OUTPUT_SEISMOS,NSTEP,DT,NGNOD,NGNOD2D, &
UTM_PROJECTION_ZONE,SUPPRESS_UTM_PROJECTION,TOMOGRAPHY_PATH, &
ATTENUATION,USE_OLSEN_ATTENUATION,LOCAL_PATH,NSOURCES, &
- OCEANS,TOPOGRAPHY,ANISOTROPY,ABSORBING_CONDITIONS,MOVIE_TYPE, &
+ APPROXIMATE_OCEAN_LOAD,TOPOGRAPHY,ANISOTROPY,ABSORBING_CONDITIONS,MOVIE_TYPE, &
MOVIE_SURFACE,MOVIE_VOLUME,CREATE_SHAKEMAP,SAVE_DISPLACEMENT, &
NTSTEP_BETWEEN_FRAMES,USE_HIGHRES_FOR_MOVIES,HDUR_MOVIE, &
SAVE_MESH_FILES,PRINT_SOURCE_TIME_FUNCTION, &
Modified: seismo/3D/SPECFEM3D/trunk/src/specfem3D/compute_forces_viscoelastic_calling_routine.F90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/specfem3D/compute_forces_viscoelastic_calling_routine.F90 2013-03-13 00:00:35 UTC (rev 21517)
+++ seismo/3D/SPECFEM3D/trunk/src/specfem3D/compute_forces_viscoelastic_calling_routine.F90 2013-03-13 00:23:42 UTC (rev 21518)
@@ -361,11 +361,11 @@
b_accel(3,:) = b_accel(3,:)*rmassz(:)
endif !adjoint
else ! GPU_MODE == 1
- call kernel_3_a_cuda(Mesh_pointer, NGLOB_AB, deltatover2,b_deltatover2,OCEANS)
+ call kernel_3_a_cuda(Mesh_pointer, NGLOB_AB, deltatover2,b_deltatover2,APPROXIMATE_OCEAN_LOAD)
endif
! updates acceleration with ocean load term
- if(OCEANS) then
+ if(APPROXIMATE_OCEAN_LOAD) then
if( .NOT. GPU_MODE ) then
call compute_coupling_ocean(NSPEC_AB,NGLOB_AB, &
ibool,rmassx,rmassy,rmassz, &
@@ -401,7 +401,7 @@
! adjoint simulations
if (SIMULATION_TYPE == 3) b_veloc(:,:) = b_veloc(:,:) + b_deltatover2*b_accel(:,:)
else ! GPU_MODE == 1
- if( OCEANS ) call kernel_3_b_cuda(Mesh_pointer, NGLOB_AB, deltatover2,b_deltatover2)
+ if( APPROXIMATE_OCEAN_LOAD ) call kernel_3_b_cuda(Mesh_pointer, NGLOB_AB, deltatover2,b_deltatover2)
endif
@@ -441,7 +441,7 @@
!----------------------------------------------------------------------------------------------
#ifdef OPENMP_MODE
- stop 'OpenMP support has been discontinued for now'
+ stop 'OpenMP support has been discontinued for now'
!! DK DK Jan 2013: beware, that OpenMP version is not maintained / supported and thus probably does not work
! call compute_forces_viscoelastic_Dev_openmp(iphase, NSPEC_AB,NGLOB_AB,displ,veloc,accel, &
! xix,xiy,xiz,etax,etay,etaz,gammax,gammay,gammaz, &
Modified: seismo/3D/SPECFEM3D/trunk/src/specfem3D/initialize_simulation.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/specfem3D/initialize_simulation.f90 2013-03-13 00:00:35 UTC (rev 21517)
+++ seismo/3D/SPECFEM3D/trunk/src/specfem3D/initialize_simulation.f90 2013-03-13 00:23:42 UTC (rev 21518)
@@ -42,7 +42,7 @@
call read_parameter_file( NPROC,NTSTEP_BETWEEN_OUTPUT_SEISMOS,NSTEP,DT,NGNOD,NGNOD2D, &
UTM_PROJECTION_ZONE,SUPPRESS_UTM_PROJECTION,TOMOGRAPHY_PATH, &
ATTENUATION,USE_OLSEN_ATTENUATION,LOCAL_PATH,NSOURCES, &
- OCEANS,TOPOGRAPHY,ANISOTROPY,ABSORBING_CONDITIONS,MOVIE_TYPE, &
+ APPROXIMATE_OCEAN_LOAD,TOPOGRAPHY,ANISOTROPY,ABSORBING_CONDITIONS,MOVIE_TYPE, &
MOVIE_SURFACE,MOVIE_VOLUME,CREATE_SHAKEMAP,SAVE_DISPLACEMENT, &
NTSTEP_BETWEEN_FRAMES,USE_HIGHRES_FOR_MOVIES,HDUR_MOVIE, &
SAVE_MESH_FILES,PRINT_SOURCE_TIME_FUNCTION, &
Modified: seismo/3D/SPECFEM3D/trunk/src/specfem3D/iterate_time.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/specfem3D/iterate_time.f90 2013-03-13 00:00:35 UTC (rev 21517)
+++ seismo/3D/SPECFEM3D/trunk/src/specfem3D/iterate_time.f90 2013-03-13 00:23:42 UTC (rev 21518)
@@ -817,7 +817,7 @@
SAVE_FORWARD, &
ACOUSTIC_SIMULATION,ELASTIC_SIMULATION, &
ABSORBING_CONDITIONS,NOISE_TOMOGRAPHY,COMPUTE_AND_STORE_STRAIN, &
- ATTENUATION,ANISOTROPY,OCEANS, &
+ ATTENUATION,ANISOTROPY,APPROXIMATE_OCEAN_LOAD, &
APPROXIMATE_HESS_KL)
end subroutine it_transfer_from_GPU
Modified: seismo/3D/SPECFEM3D/trunk/src/specfem3D/model_update.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/specfem3D/model_update.f90 2013-03-13 00:00:35 UTC (rev 21517)
+++ seismo/3D/SPECFEM3D/trunk/src/specfem3D/model_update.f90 2013-03-13 00:23:42 UTC (rev 21518)
@@ -174,7 +174,7 @@
! print*
! print*,' SAVE_MESH_FILES: ',SAVE_MESH_FILES
! print*,' ANISOTROPY: ',ANISOTROPY
-! print*,' OCEANS: ',OCEANS
+! print*,' APPROXIMATE_OCEAN_LOAD: ',APPROXIMATE_OCEAN_LOAD
! print*,' NGLLX, NGLLY, NGLLZ: ',NGLLX, NGLLY, NGLLZ
! print*,' ATTENUATION: ',ATTENUATION
! print*,' USE_OLSEN_ATTENUATION: ',USE_OLSEN_ATTENUATION
@@ -974,7 +974,7 @@
jacobianstore,rho_vp_new,rho_vs_new,qmu_attenuation_store, &
rhostore_new,kappastore_new,mustore_new, &
rmass_new,rmass_acoustic_new,rmass_solid_poroelastic_new,rmass_fluid_poroelastic_new, &
- OCEANS,rmass_ocean_load,NGLOB_OCEAN,ibool,xstore,ystore,zstore, &
+ APPROXIMATE_OCEAN_LOAD,rmass_ocean_load,NGLOB_OCEAN,ibool,xstore,ystore,zstore, &
abs_boundary_normal,abs_boundary_jacobian2Dw, &
abs_boundary_ijk,abs_boundary_ispec,num_abs_boundary_faces, &
free_surface_normal,free_surface_jacobian2Dw, &
Modified: seismo/3D/SPECFEM3D/trunk/src/specfem3D/prepare_timerun.F90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/specfem3D/prepare_timerun.F90 2013-03-13 00:00:35 UTC (rev 21517)
+++ seismo/3D/SPECFEM3D/trunk/src/specfem3D/prepare_timerun.F90 2013-03-13 00:23:42 UTC (rev 21518)
@@ -170,7 +170,7 @@
endif
write(IMAIN,*)
- if(OCEANS) then
+ if(APPROXIMATE_OCEAN_LOAD) then
write(IMAIN,*) 'incorporating the oceans using equivalent load'
else
write(IMAIN,*) 'no oceans'
@@ -291,7 +291,7 @@
rmassz(:) = 1._CUSTOM_REAL / rmassz(:)
! ocean load
- if(OCEANS ) then
+ if(APPROXIMATE_OCEAN_LOAD ) then
call assemble_MPI_scalar_ext_mesh(NPROC,NGLOB_AB,rmass_ocean_load, &
num_interfaces_ext_mesh,max_nibool_interfaces_ext_mesh, &
nibool_interfaces_ext_mesh,ibool_interfaces_ext_mesh, &
@@ -1291,7 +1291,7 @@
one_minus_sum_beta,factor_common, &
!ZN one_minus_sum_beta_kappa,factor_commonkappa, &
alphaval,betaval,gammaval, &
- OCEANS,rmass_ocean_load, &
+ APPROXIMATE_OCEAN_LOAD,rmass_ocean_load, &
NOISE_TOMOGRAPHY, &
free_surface_normal,free_surface_ispec,free_surface_ijk, &
num_free_surface_faces, &
Modified: seismo/3D/SPECFEM3D/trunk/src/specfem3D/read_mesh_databases.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/specfem3D/read_mesh_databases.f90 2013-03-13 00:00:35 UTC (rev 21517)
+++ seismo/3D/SPECFEM3D/trunk/src/specfem3D/read_mesh_databases.f90 2013-03-13 00:23:42 UTC (rev 21518)
@@ -209,7 +209,7 @@
read(27,iostat=ier) rmass
if( ier /= 0 ) stop 'error reading in array rmass'
- if( OCEANS ) then
+ if( APPROXIMATE_OCEAN_LOAD ) then
! ocean mass matrix
allocate(rmass_ocean_load(NGLOB_AB),stat=ier)
if( ier /= 0 ) stop 'error allocating array rmass_ocean_load'
Modified: seismo/3D/SPECFEM3D/trunk/src/specfem3D/save_external_bin_m_up.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/specfem3D/save_external_bin_m_up.f90 2013-03-13 00:00:35 UTC (rev 21517)
+++ seismo/3D/SPECFEM3D/trunk/src/specfem3D/save_external_bin_m_up.f90 2013-03-13 00:23:42 UTC (rev 21518)
@@ -37,7 +37,7 @@
jacobianstore, rho_vp,rho_vs,qmu_attenuation_store, &
rhostore,kappastore,mustore, &
rmass,rmass_acoustic,rmass_solid_poroelastic,rmass_fluid_poroelastic, &
- OCEANS,rmass_ocean_load,NGLOB_OCEAN,&
+ APPROXIMATE_OCEAN_LOAD,rmass_ocean_load,NGLOB_OCEAN,&
ibool, &
xstore_dummy,ystore_dummy,zstore_dummy, &
abs_boundary_normal,abs_boundary_jacobian2Dw, &
@@ -94,7 +94,7 @@
rmass_solid_poroelastic,rmass_fluid_poroelastic
! ocean load
- logical :: OCEANS
+ logical :: APPROXIMATE_OCEAN_LOAD
integer :: NGLOB_OCEAN
real(kind=CUSTOM_REAL),dimension(NGLOB_OCEAN) :: rmass_ocean_load
@@ -196,7 +196,7 @@
call any_all_l( ANY(ispec_is_elastic), ELASTIC_SIMULATION )
if( ELASTIC_SIMULATION ) then
write(IOUT) rmass
- if( OCEANS) then
+ if( APPROXIMATE_OCEAN_LOAD) then
write(IOUT) rmass_ocean_load
endif
!pll Stacey
Modified: seismo/3D/SPECFEM3D/trunk/src/specfem3D/specfem3D_par.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/specfem3D/specfem3D_par.f90 2013-03-13 00:00:35 UTC (rev 21517)
+++ seismo/3D/SPECFEM3D/trunk/src/specfem3D/specfem3D_par.f90 2013-03-13 00:23:42 UTC (rev 21518)
@@ -170,7 +170,7 @@
double precision :: DT,OLSEN_ATTENUATION_RATIO,f0_FOR_PML,PML_WIDTH_MIN,PML_WIDTH_MAX
logical :: ATTENUATION,USE_OLSEN_ATTENUATION, &
- OCEANS,TOPOGRAPHY,ABSORBING_CONDITIONS,ANISOTROPY, &
+ APPROXIMATE_OCEAN_LOAD,TOPOGRAPHY,ABSORBING_CONDITIONS,ANISOTROPY, &
ABSORB_INSTEAD_OF_FREE_SURFACE
logical :: PML_CONDITIONS,PML_INSTEAD_OF_FREE_SURFACE
Modified: seismo/3D/SPECFEM3D/trunk/utils/unused_routines/create_movie_GMT/Par_file
===================================================================
--- seismo/3D/SPECFEM3D/trunk/utils/unused_routines/create_movie_GMT/Par_file 2013-03-13 00:00:35 UTC (rev 21517)
+++ seismo/3D/SPECFEM3D/trunk/utils/unused_routines/create_movie_GMT/Par_file 2013-03-13 00:23:42 UTC (rev 21518)
@@ -19,14 +19,14 @@
NEX_ETA = 288
# number of MPI processors along xi and eta (can be different)
-NPROC_XI = 12
+NPROC_XI = 12
NPROC_ETA = 12
# model (SoCal, Harvard_LA, Min_Chen_anisotropy)
MODEL = Harvard_LA
# parameters describing the model
-OCEANS = .true.
+APPROXIMATE_OCEAN_LOAD = .true.
TOPOGRAPHY = .true.
ATTENUATION = .true.
USE_OLSEN_ATTENUATION = .false.
Modified: seismo/3D/SPECFEM3D/trunk/utils/unused_routines/files_needed_asteroid/DATA/Par_file
===================================================================
--- seismo/3D/SPECFEM3D/trunk/utils/unused_routines/files_needed_asteroid/DATA/Par_file 2013-03-13 00:00:35 UTC (rev 21517)
+++ seismo/3D/SPECFEM3D/trunk/utils/unused_routines/files_needed_asteroid/DATA/Par_file 2013-03-13 00:23:42 UTC (rev 21518)
@@ -26,7 +26,7 @@
MODEL = SoCal
# parameters describing the model
-OCEANS = .false.
+APPROXIMATE_OCEAN_LOAD = .false.
TOPOGRAPHY = .false.
ATTENUATION = .false.
USE_OLSEN_ATTENUATION = .false.
Modified: seismo/3D/SPECFEM3D/trunk/utils/unused_routines/from_old_DATA/lin_model/Par_file
===================================================================
--- seismo/3D/SPECFEM3D/trunk/utils/unused_routines/from_old_DATA/lin_model/Par_file 2013-03-13 00:00:35 UTC (rev 21517)
+++ seismo/3D/SPECFEM3D/trunk/utils/unused_routines/from_old_DATA/lin_model/Par_file 2013-03-13 00:23:42 UTC (rev 21518)
@@ -26,7 +26,7 @@
MODEL = Harvard_LA
# parameters describing the model
-OCEANS = .true.
+APPROXIMATE_OCEAN_LOAD = .true.
TOPOGRAPHY = .true.
ATTENUATION = .true.
USE_OLSEN_ATTENUATION = .false.
Modified: seismo/3D/SPECFEM3D/trunk/utils/unused_routines/from_old_DATA/par_files/Par_file_Carcione_copper_ori_r2d2_serial
===================================================================
--- seismo/3D/SPECFEM3D/trunk/utils/unused_routines/from_old_DATA/par_files/Par_file_Carcione_copper_ori_r2d2_serial 2013-03-13 00:00:35 UTC (rev 21517)
+++ seismo/3D/SPECFEM3D/trunk/utils/unused_routines/from_old_DATA/par_files/Par_file_Carcione_copper_ori_r2d2_serial 2013-03-13 00:23:42 UTC (rev 21518)
@@ -26,7 +26,7 @@
MODEL = Copper_Carcione
# parameters describing the model
-OCEANS = .false.
+APPROXIMATE_OCEAN_LOAD = .false.
TOPOGRAPHY = .false.
ATTENUATION = .false.
USE_OLSEN_ATTENUATION = .false.
Modified: seismo/3D/SPECFEM3D/trunk/utils/unused_routines/from_old_DATA/par_files/Par_file_Carcione_copper_very_small_serial
===================================================================
--- seismo/3D/SPECFEM3D/trunk/utils/unused_routines/from_old_DATA/par_files/Par_file_Carcione_copper_very_small_serial 2013-03-13 00:00:35 UTC (rev 21517)
+++ seismo/3D/SPECFEM3D/trunk/utils/unused_routines/from_old_DATA/par_files/Par_file_Carcione_copper_very_small_serial 2013-03-13 00:23:42 UTC (rev 21518)
@@ -26,7 +26,7 @@
MODEL = Copper_Carcione
# parameters describing the model
-OCEANS = .false.
+APPROXIMATE_OCEAN_LOAD = .false.
TOPOGRAPHY = .false.
ATTENUATION = .false.
USE_OLSEN_ATTENUATION = .false.
Modified: seismo/3D/SPECFEM3D/trunk/utils/unused_routines/from_old_DATA/par_files/Par_file_EGEE_gros
===================================================================
--- seismo/3D/SPECFEM3D/trunk/utils/unused_routines/from_old_DATA/par_files/Par_file_EGEE_gros 2013-03-13 00:00:35 UTC (rev 21517)
+++ seismo/3D/SPECFEM3D/trunk/utils/unused_routines/from_old_DATA/par_files/Par_file_EGEE_gros 2013-03-13 00:23:42 UTC (rev 21518)
@@ -26,7 +26,7 @@
MODEL = Harvard_LA
# parameters describing the model
-OCEANS = .true.
+APPROXIMATE_OCEAN_LOAD = .true.
TOPOGRAPHY = .true.
ATTENUATION = .true.
USE_OLSEN_ATTENUATION = .true.
Modified: seismo/3D/SPECFEM3D/trunk/utils/unused_routines/from_old_DATA/par_files/Par_file_EGEE_petit
===================================================================
--- seismo/3D/SPECFEM3D/trunk/utils/unused_routines/from_old_DATA/par_files/Par_file_EGEE_petit 2013-03-13 00:00:35 UTC (rev 21517)
+++ seismo/3D/SPECFEM3D/trunk/utils/unused_routines/from_old_DATA/par_files/Par_file_EGEE_petit 2013-03-13 00:23:42 UTC (rev 21518)
@@ -26,7 +26,7 @@
MODEL = SoCal
# parameters describing the model
-OCEANS = .false.
+APPROXIMATE_OCEAN_LOAD = .false.
TOPOGRAPHY = .false.
ATTENUATION = .false.
USE_OLSEN_ATTENUATION = .false.
Modified: seismo/3D/SPECFEM3D/trunk/utils/unused_routines/from_old_DATA/par_files/Par_file_EGEE_small_4
===================================================================
--- seismo/3D/SPECFEM3D/trunk/utils/unused_routines/from_old_DATA/par_files/Par_file_EGEE_small_4 2013-03-13 00:00:35 UTC (rev 21517)
+++ seismo/3D/SPECFEM3D/trunk/utils/unused_routines/from_old_DATA/par_files/Par_file_EGEE_small_4 2013-03-13 00:23:42 UTC (rev 21518)
@@ -25,7 +25,7 @@
MODEL = SoCal
# parameters describing the model
-OCEANS = .false.
+APPROXIMATE_OCEAN_LOAD = .false.
TOPOGRAPHY = .false.
ATTENUATION = .false.
USE_OLSEN_ATTENUATION = .false.
Modified: seismo/3D/SPECFEM3D/trunk/utils/unused_routines/from_old_DATA/par_files/Par_file_SC_288
===================================================================
--- seismo/3D/SPECFEM3D/trunk/utils/unused_routines/from_old_DATA/par_files/Par_file_SC_288 2013-03-13 00:00:35 UTC (rev 21517)
+++ seismo/3D/SPECFEM3D/trunk/utils/unused_routines/from_old_DATA/par_files/Par_file_SC_288 2013-03-13 00:23:42 UTC (rev 21518)
@@ -26,7 +26,7 @@
MODEL = Harvard_LA
# parameters describing the model
-OCEANS = .true.
+APPROXIMATE_OCEAN_LOAD = .true.
TOPOGRAPHY = .true.
ATTENUATION = .true.
USE_OLSEN_ATTENUATION = .false.
Modified: seismo/3D/SPECFEM3D/trunk/utils/unused_routines/from_old_DATA/par_files/Par_file_SC_384
===================================================================
--- seismo/3D/SPECFEM3D/trunk/utils/unused_routines/from_old_DATA/par_files/Par_file_SC_384 2013-03-13 00:00:35 UTC (rev 21517)
+++ seismo/3D/SPECFEM3D/trunk/utils/unused_routines/from_old_DATA/par_files/Par_file_SC_384 2013-03-13 00:23:42 UTC (rev 21518)
@@ -26,7 +26,7 @@
MODEL = Harvard_LA
# parameters describing the model
-OCEANS = .true.
+APPROXIMATE_OCEAN_LOAD = .true.
TOPOGRAPHY = .true.
ATTENUATION = .true.
USE_OLSEN_ATTENUATION = .false.
More information about the CIG-COMMITS
mailing list