[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‘]kƒ0†ïýçRaIsòQõ²s::°”ª»YwZ»	#…hû÷‹Æ1ÖÑ«CNž“çMÂà
-<ìF½¯ƒE!`L9*	õ	8.©p-™2šõ^Âj›gE^Š‡ˆpÅÂLÛ¡í;m¢×ú	$Ò%C iŠ‰húÖz¶Ôæ¢?FЙ$ ƒ”⣉ISɁHáLÊî¹B?¸µ9´ÃÙøecºˆ«ð3B¶¶ï†/ßß3ÅšjåÊ<§ÍqŠE8§,M pš9W¶ÙU[ø²ÞìÖ«?[¢óiÎ5nè˯½°ÚŒÞ8¦ÉòJû!âtÚÏu8õ4q´‹šP>?u©íáÝ3ònfŠþ÷}y|E¿r
+xÚu‘Ájƒ@†ï>ź›ÙݨÇÔjIÁ¢öÒô°$¦Š5…¾}W×Rš’Ó°ã÷ûý®Þ@À£'nÌûÒ[dJ†œP+(O@¸äÒ®T,x$%”Gxñ‹mšdi.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–ÁC‘kŒÞ\aŒfãÙàËü‡wמ×YÞ¡i¹lNíÀq‘çÅÛÕOسß4Ô£†N D—ÆN/Ç£ÛYoüñb–zÍ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ö`CC4JgTlxI“¸¤îZ­êB‰§‰«S'‚#$ùZ
-ðicJ¶ÞîÒ":=™‡¶Ližme1ÂÀ=Y‘1ª˜q—pZâêÍOfž]{l×@'kåÁ¾q؁µ•ï@ƒ|‹¥,ÔQyJ:«0²œW¯âßp™qF·óøÜ ›¼Î*VWgŒ(_wºE›†Æ¯–åÂ¥Qmµ,<óÌ<Œ>Ð8žY€36А„KϧwÓ÷£»›ŸŸÂß3Ñ`
-éÛ³œÖ¦=Ë541ÏP[Øj%Û³mìtyS¶ëÁÝõô:->Æ© ^¯["âFNB ˜^<ÂAjšm0ü€À—8=shj?7±çšÂ]p¥	ù¶ˆ;€¿Ú=Ú´2׏L'ðú¦²Œ+Å»—•º­VØb%˜½ÂJ ª­©¥®<ö0VIa¥j‘9AïÑ>°,ÌI¹%A‚ìÍÚ™`kÒ
-®Cr´ÓœRH`º®›Qæî„ð†ÌÜÅînÇåí¸°Ïz¹àZUe—ÁÁ:Í’e±zWîâB®ßXÒM»Ñ*è]­ÃW~â´&0ƒUeÚ¡+8P ä“
-1Àx0Q¼äž}bq|MÒ”)Uº*Bþ i$vœ} :Ô!ÙŒ-|ÓG‚b¡@¾Ü½#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½¥6†CñŽhÔQT@£nÁ¦ âRºD’~6![²?¤J”¬pÅ´áiº–€F9lÊaeLO!抋S§)ó4Y«»ëØÆ]ŠªG…{x¹UíbeÖ®¶Ïøé0¤ÇH@)‡$Ð4_%UBöãr¤åy]PkŸ¯eʃžn›¹—¤¦˜èQȍ,d¶â47ø‹C>…@æ+!Øñ¬v1H§ÍwÀzÓzáãißlŸxNEä`*hÀ‘'ÉOºù(0}/Ò׺/‹µ¸_ïÇ·—ãx`{B….²Þê¡öB@êz!ø{ÖÁÇˆ¾PžöFà¯A%í†ðj<zÆ
-Áx?|¡‚ÌMxm<ò4v¦¸ý ot;™Mç÷Ó»Wx„݁»£è%¹dà¹=è†	Éx‚€ƒë¬]GQkuãìõ3)ó
-Dd &ukÐÆè½¥À[JId@9«uÇÅp¢‰ ÕŒµ–¹‰¬§‰Ó³ƒŽÝ)ð÷ ZÄiú(ò´ò…c:‘ÛUþVf˜FÈÅ:®â¥J2N™>4
-DkuÅQF éU¡òXe‰G é°ûP¹—–©JËÑŸáñËglËFÛýÀ`>ýÄÉÃân4¿yÊÀ"®|³û«F@`´ßcòœdµ#_i¬gì{‘)H­%!àj	ó©ðÚ$hÔ%9{`$—é\Fsgj% Œã¢âõA&RAŽ5¥žŽ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ßþáX‹r¿ü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Ÿï¯GGžUEè™®õUYbuF®p_¢‡ {ŠÀIX_TO¯'s wdÿz2o	¾Cj‡’¹ã„¦ðÜã ¤àìQêb¢5€Y&ùb©S†
-u“ª®$ƒPÌ^¤ÐXóhZS´¹1g¯Õàݧ/¼<<ûmðL
-³¬3
-óMO<ÿÚóL¯ç•ÂpFR˜Å7ž—CØ&3ŠºÊ²Ž.ˆÅþ1=
-åË·À  (e²¯	¼ ©=ïU»°²[CÊ7
-¼¨ï»'Ònøiãh€ÒWÖ\ÑhìpÀ
-øúõ¥aÔɹR¾oº¤¡à¬†Dä½DC„‘44â¢PXCØìjÈ?ÒPÐ ëdùê:)J×Äé~Y¡ØGAþÿÀuúûäj~³ø4y2H³õ,:¥‡þ–Á‰ó»ž¸®vy‘ü[‡3Ë6ûUWwó`üžäˆ!.vhl›pE'(‡*Ù·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ªa•GÔÕ¡®hדx™daÊ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˜õ¶•,Ϻ Ç,wm1A—t~ü"^А*ª¶($×[íp¿o¾ô!ð9»/$4ÖF—Gyø£ ´k‡§¾_Ïßü&GCe
+xÚÝZY“ã¶~ß_1o¦â—x¤*Úͮ❑j¤uìZo)	±L‘
+¯'¿>ÝèsØyI^Dl4€îÆ×d]<\XÞ¼_¼ywí‘ùŽ±Ø\ÎEà†‹õÅãòãh¶ß
+†Ž°Ï…o—wãÑÀ¶mc1¹ý@ŸÇÔ¸šÌw“÷Û2>/ÆWÜ9ð,ƒ‡"×½¸ÂÍÇóÁ×Åßß]{^gzO„¦å°8µÇEš7/W?aÍ~gÐP:tº4v4›ÝMšÜŒãåôr<º]~šŽ®zü&·]ßôÂPO>—ì 
+Œ*§•Š¨Cì ­ekZ³*jižÚeº¢a™l˜ãVRCnŽ06rÅSå‡ùJÆYÉ팞¥LÊ]²¢—o(íxàXÆo[<l_äûøa Œ¸JšaÛ¼N×Ô¾—¸Ö‹¡„¦ëÁÓ6#!x‘Ù*/öyW©ǸKjÚF½Wì “–_,ayý°…†M]ñð{²4¬*d\ídVÑ÷uR®ê²Ôü“Œ¨~@ËÈaTR•«-³Ê˜h‹|·'Ú/Že9÷_Á*ÝÀ7Û¤T;²ú{ÙÀ´u!‘È2€„ž™DQý¾—Y™ üµäð㦀–PUGVïd‘¬â”^÷²(÷ ¯ÎÀ·ƒ¡gYÆ}^mõô¬d±ã9Q±Èt'wyñH}…üWÅÂTj³Ø¸œ}fÉŽìêpgjÇC×ó:ÂVªÆ®d`úëjUJê­¢'ì"É×L¢Ö湆RbúHŽEOÍF­iž=Èb „€ÙƈY‚y°á#þ.Y
+öv­½ØcÆÁ'6ºß‚õ•ï@‰À‹{Y¨Ý–1	?³¼¢FÿŠ,eÆß38ªÒÈë¬zKo–Lùm«[dÞÐøŲ\8J½‰òÌ< ’> 9žY€G6ôa—RØt6ýp7š}üù)ò=3
+þ‘’O´†Œ/ÔéÃ2P[ØÓJ¶gЊxs½lX¡øzžóXy‘.h¦3^\©'‘ÒuÌ òžEJW˜¡ß°Æsm…ŒÁ°ÕÓœ-3rÝç9‡@ÖÅ`}ž˜–å÷­Ê÷ùCï· (ZWk
+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¦È°MQÍ[tÆÚ	²ÀύÎõ<Ä')RpÀÜu2Ö 1ù
+Þ$D>'Ü ÍíûÝ8_¿ØQ½¥6†Dñ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¶o‰–OÌSu’4 ¡‘™ä'ý|˜¾5~¾…—åÆZލ¯ÇwãÛËñ)Oï	»h@Èz³‡Úë@W×ëÀëY¯ƒ± )ñJçãxÞ¡ób+<zÆùÀx?|¡ózµqÊ3ؘvàö#¼Ñíd>]ÜMg¯ˆð»ÿ,vGÑóЙçö ’ñ:CÌÚyTo­NtÄ™~&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‘(t‘ZKCÀ‰©ð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ŸþáXr¿þ1…){y‡'UîLú{¾’Xk‚pӐeç†A·øEû[ú¬*UÐ{DÖ
+ÒµBÁPšxPEO
+‡ì)DÔ?ÑFR£÷óéÝûÉí‡ååôöj‚²š?)&`"ځ:.&ÏŸ<$ Ï{\Ï6]¿›¦*žï`‹²ì¹LãÇ*φã’”²¢ñ}™÷Ê‘æcšX•á#hgpbŠ_[I»:Ijã‡\Yˆ¾ñwJ§]ì–NÑT1eøS
+XNnç‹ñèj9½^^ߍÇËùç»ëÅ‘gUz¦kE}Uœ«\á¾DA[°WŠ@Ž¤hézhWæÐÝ‘9¼õdÞºl‰+ÜëR at h
+Ï=B
+Î¥®!&Z˜e’? ’:eØP§0©êJ2ÅìE
+5GluLÑæÆœ½Vƒ³›O/<<<û~?Ru-ëüuˆˆ^râµñ¼Rr$…Y|rày9„eâUEÔU–up@,ö¿ØˆéQ(_þ 
+º §Lv5 5¬ÑxOuz‹J»5ä¡|¢À‹ú¾{"íV€ŸÆ 1Ž(}e͍Æö{,¯__Fü‘#åû¦ÛVqYCç/¬ÄÊ° !ßë)äÈâ¢ô°†°ÙՐ ¡ @ÇI­nO”]§óe…f`Û}
+ü§L®—7“'ƒ´Ð1[Ïò¡Szè/œ¸ª¡áöªm^$ÿÖáÌ}›ýêëŒfñ`|5r@;4špE'(û*Ùµ¬+ñ¯<”}ÙèSMðd²x&q¡ž“Îè§ÿ†tâßÿ¤ÃÇ~c-¯§wKdóâ‚A7ÒëmrCo¬³Ò~I‰)cþÈån”šÔñ±<(¬´Énœ®ê´—Üþ•Ž+¤ÉáA5gôiöq„º^6²ù=f“¿´Û}ý1ÿ, ?Ž~ߌf/Ï	ÁÕ7,ãê=Õ{
+*•Äýç¡4º=¨ŽXÈV×­GWȘoù>ò&Þÿâ_]ûFbJ“›L¸—@¨F>dÏØÛ©p>RÏ.ÞSCUgÊáùB‹A_+pjÀ	ò…ÆBi]±v»EÄS¨X©Ô‹Ï‹:pyVéTi!ežQéýäèþÊÛ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= ty„E ];<õ/·ñâÍ 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‚]œ³$gˆ0…´ŒÚ›[9”²>ZÅ@£§È<ºÜʦñÚ£’¥¨¤™7:—:R‘J–¥s;Ç‚Uy¬ÄBȶ’…D&”Pt”Ù¶2j1F„W˜l‹hY´!?áXôÙѳɃbé¡À”Í/!P¢—BI³¤HÛ
-¯œŒöTò,Ù$·PB;óÝÈR€#¢D/f/ʺÍØ\›²uÈáTvè@‚£œ[Ñû+•_]S‘ÞŽ‰±Èa•¦ÞñEŬ¿,…WB>úp†š‘¨@“H‘Up¹H…”¦gã¸-	b.bt(³EÑ-­‰CÖ&KFBkcs[MEò%_G‡Y2L
-ˆ”û%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ãÖ'‡öžëwxPä8ygò¶n•bˆçºURð}ì±?15=zÇÄÇßÿÀ„dêNˆMýË^ïsÓp¿êr¯ûˆS+?±¨Ãäñ}DƒÉ4¾@ÐÒ±iŸwZ59¤|…ÞÅa]•x-&÷ö™8.¿ŽØçYMgå–x!ÊþhH“-Ðó¤auYŸ–ÃqÎue§[ìV_YÖ¡Ç|´€Z‹OS at Uã†YÿCœ³É“³Ì¸`ô¤`SSÓ´17m\SðM!4…ؚǭl
-jRp757c‡øüX?¹;q÷ˆÕH
-<AãÆÁQXŽGcæO›WǵÔ'«øë¬Èw˜7éV̇¼µyIl2Ü*Ê^Š›D¹¾Ž™ä¢¦µX’”Ö'Hr™ÂÁ@–â²Õœ2,Ò,7VmNeÁ‚½Ä#’‘^6.H0<`5‚h)9rçr‚H]¬/¸*¸HÄ„´$"p$ò È ôÆüló#‚<&«s·b̝°XŒyQ~Å(‚¼âf¬<Œ5H~ &bòÚù–yÛÛ+vkiÖGà­º‘ÎjÈR›—Ä&Åp¾•‘K ×&ŽX9ðÏ&EI‰kÀ@+Y‚¨’|Yé‘Å7ª§1sˆü }«
-÷Hø›®Æ[ØX4Á?ÀµRÌcZT6‚hi¸CŒÛ€ ³¡„ÌÃ	ª€arâN˜ÉÉ.Œ$‘ë{pÑþ`¸øhLèõ}Lèåã1¡m`žk€Ÿ»©i€Ÿk€Ÿk€Ÿk€ŸK«a¹b~7Šlˆ ¸CͱâŠùQ£;p_‡Yn³» ;òøhAæÍ'u«â{àÅN*r_k,àÜNA–üxò.ùUÄγgy ±“ÇGâ?ï^Ñÿ'×××|PÔÅU·¼æU}¶½.Õ8TJÙ&ÞÆ?,câCšY#OUÈJ´°d5ˆr&ñDŒ†@q!„Ñ뤩D‹áª„Gh‘-š),R˜N«uÏ.ë’¥¯1üèß݈_ óˉáÖ(Fr£už 9­‚dîHցZäœÕƒb0(ûîW¾s/{õÿ†SKþ	ºÞ¯3 ¦¼fÃœG0¡e,òM">&s°äÄ)ì:ça¦ó!ªÓ¢¨ƒ«¦¼¬é¸×záL5÷]">ì÷*…h…YJ¨-Á·ÀQYƒ‘¬q}ˆÖÓƒk[,Š,M–TÄ~`±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ûŽ—¿¤—Ï4„i´œç³3þ7ã¦3¼Žè˜ì}wJzwj–c³˜›åÅØxZlðklBilðklðk³Þˆ—ë\ž–5{òâð5{q^
-GÃÓº;±È½ÙÆ;ÕeA6Ü+F%{²÷/-e’Z—Ex*Õ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‘Ñn“7ãCö–ñ_ÌËh#MÓZùù=Iô®Aa8‰‡œTö†æÊ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½K‚’Y’M7$ªèÁœD»X†ÁçódÉ?@‡QøÚ>uöc–Ü/&ô$D°+1/¥î3/bªf^±a^©a^i¼èä׸ dSPËÓ+Zé•Ò2€9%©¬ùã.±º{sB©ÎŠËáðËÕð˨î¾\TD­ÆÔé.úï/þØóêéÁ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´¬F‡P&‚i9Ý€ w at qTœâ#7pm• 2è´q &óß³‡±"&Î'Ê\ŸÑ…¼¥N1–Nˆ¯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¿‹Ð+Ûâö;]bŠx(«Ö¹q¨é#R©7H¡,N9N‡Ö=rŠt‹Ԑî¥k}*ay=Ê
-^Ý·‚K+Xa²s¦lh
-±)4ô¯9à¯\Ã'oK?åi
-“=9åoj\Sh†h—©Éá²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¹|×2cH‰Kcƒ&
+m>¿«ÃÁ廞™˜h Mc8¨DùüDbVgùðúÖÒ«J/Aeù<øœ'	¼eÖ'zÖ{f£!ð%O|P¦“Òm¡'iÀP‰FP¶Ž4DtV‘LP¦s¤`"L!=#þ`3—•õ™Àž"óÒ'¼CJÌk0ÃH.AiæÎ”AGpP–¥3ŸcÁª<Vb!fÛFÉBÊ^‹2Û6jø‚’ʏ&ÛbDóŽEŸm=‹Á‘|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ÉÈñµq™W™òðè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¹‡Û89œv‰;Ú9/£²ÆlNí=×0NtxPä8¹Cò¶n•bˆçºURð9}ì±?…ÉÞ1ññ·ß1!Y€ºÂRÿ²×ûÜ0îWýQîuŽiœ?±7Öaòø>¢ŽA_ héØ°Á#ȃ&9¤|…ÞÅa]•x-&÷ö™8.¿ŽØçyMgå–x!ÊþhH‘5Ðó¤auYŸ–ÃqÎme§[ìV_YÖ¡Ç|
+IC-‡E§i¦ª1cÖÿç,Còä,3&Œž65-
+™ò¸†ð
+"6Dó¸•
+¡&„›¶LÇñù¡~2?qL„ŸÂ’>Yž q5äA:Y<qþU×RŸ¬ã±ó’؈©•4’8ex€®þ’$Ã)Á\p“(ÛÁÛ1—tƒ9µ\’”6'Hr¹Â!tXŠÌV󀄈DˍU'B4÷ SA<béåÑ	ä~*ˆ–’#{®&ˆÔÅæ«‚‹DLII"B`" 
+’„EùæG„yç¸s7b̝°\ŒEq~ÍŒÌâh¬<5H€&bòÚÅ–yÛÛ+vki6'	04·э$pVC–z|IlR\é[9`õ4ŽX9€ÞcŠ’× ‚€kÐ
+¡5Høe¥GT¥8™CåO Ñ7J1 JHù\Îa#@ې÷4U[)æcZT 6‚hi¸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^ ØÁh—B½ÉB•
+c¸*áZf‹&G
+‹…Z§UŒ?»g—uɁÒ7þôï¦bÀW èüjb¸
+Š‘€Üh¥'hNë`™;’u ¹`ý Ê~§û•ïÜ	Ã^ý¿†áÔ†ÃÃðo‚®÷›¨)¯Ú0çLh™Œ|“
+“Xrâv“s„0S‚ùÕ ‚ƒ«&›ž¹×zéL5w]"Þïw•B´Â,%Ô–à˹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/Ÿc„i´\ä³sþ7ç¦s¼‰è˜ì]wJz
+wjc³œ›ÆØxZlðklBilðklðkóÞˆ—ë\ž–5{òâð5{q^
+GÃÓº;±È½ÙÆ;ÕeA6Ü+F%{²÷O-e’Z—R‰ðTªHùðTûXŽ»£^V½Þ·ëªê|y~pÌËÁ°¥‚;ê¤d¯z½Ëᨦ¦OOÞ}ÚfÁ³s9:'–£ì>ìuq²=o„_¾Ž^ ¼q‡êËráý·‡L5ww‹a™D¼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Ñ'ä$±ß+ΆÙ>;ÃSŠuhÆä//ËîÙ9.­DP/Ç÷èÙ-ñjTôº§;ý3„Ü<•.ºÃ!äζEd“¸ûqҏó¸ óSÜ~"ž‹=ñòځ8Ç¢'âTtD)þgâ\œœ—}Ñ=q!ú¢Q‹¡ŠÓRŒÄ¥¸×âÛöøÍö»½’`¤ÌuUµ9ôŽÍ 2P^Ç›èÈLu„æY¹èft„gè(&ô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ÍØåö¹ø£“DWŸbÌ“8 ßuÔ¶ew"ÌCË	%lbN\éøˆþA;x6÷±$n â][’ûË!w¦0$êxLh²sB	¨ÆŒŒßWõzý?«®Ä°8½]%³b4ËH¥>¢s!ÕÅ*|Ê'œü=åв~®lŸ9ý1_Ü//èó6»Vå¥ÔÝÊ‹*ÕW^±©¼RSy¥IåEg¿Æ„’
+¡V/¯\h-¯”–•S’ÊšßoV·oNJª³âr8ür5ü2ª»Á€/Uç•VãÒév…uÞ_ý¾ÿæÕÓƒo¥óÓ»ê¢è· x•XHiµ¸2¬úãb[k”óŘM‹û´yZX8-íW 8S‹ÃÕfR<åOjqùŒ¤DáD§îŒ¡“!Mñfƒúè|¡5&ðó'œ9LG^ƒVSüio :©¢Óå
+D§«vˆ®Ô-Œ	Ë̓òƒÆ(>	†ÏƒðÛ \Ëu ୣȡšÕ€ù¨Ø¥ŒBÁÌIÃUX’IöŠã:Å
+žÁ 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·èœËJBQÏ#çÿÙ4g ˜öÓ“ÁðºF ø´=“íÿB6uñÊ
+±½Úziö	½âòü£RôÚùÛùüá#8O‹Ð!öÉQàûˆiA™FoÜGî[‚7ÖÞ·?ÇržW£jx^
+Øû²b¸¼q«£ããWoß}9)Æ¿”_½¢Û/'Èru_1«šYF…˜O‰v¶è õæ|¥Å%ò÷0Ö,<l‹KØït‰™ÂCYµÉCMG‘J½A
+u¨â”ãtlÝ#§H·ük
+éNê°æÁ§V·Ñƒ¬àÕ]+¸´†&;gʆ†ˆ
+Ñ”ÍåšÊpò¶J5gÊTs¦Lùi‹kˆfˆæp™š.ÛÐ7¬·œÊGÑ71gð!éË`‰Ûe+iŠ—ešîÿê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™Ö´¡`Å(2mH‹‰5ÇD¶ç4Sj†?ùšÖ3™66¡Ó[€~mÚ†¶Ã–vS:Pf ÝçåŸGûþvÏžÝïý½ßÙï]9Nö³d9N–#ŽSÿÉJöe9yn!š€¬X³Ñ
-³AÚ´|Â\‡–DÛB˜ [ÐFÐ4ÔƒÐ. åꡍ£é©ŠA	ÚZa)ØŠ6‹¦—±
-lG»‚–EXv ­ é-”ƒŠ,'ûé=háNP‰v(Ö:®Vj´y´Â°í2Ú2ánP›åä$šÑ–÷€½hÑ<Â:°/Öü´EÂzЀVŠv…°4¡íE»L¸4£E[ l­hŒsÇ<áІvía;8ˆvÍ%<£G›#<:ÐÑf	;ÁQ´!´Â$èB›B›&ì=hÓhS„ÇÀq4rÔ1IxœD#G„§Ài4mœð8kQÚEÂsà<ZÚa/èCëD%ì)´´„`­m„p£¥Ð†	uÇ4|Ú¡‡èIÇÐ.¢
-ꍣéèéõf&ÑtR„:Óhz¿zi:ˆñäzYh}„š ÚêÐÛÒäÍ£éœ'ÔÄ_FËGÓ!QÓ,¢ %TÃ-¡¢épªYWЊÐNbôÀ‘þŸÜrØQÌòP)AEÒq’*rКÐÈe@…yhL Ç	©î`Z>(ö ¾¾ÜÌU´BŠ=ˆ¯%×èá¡€bJÐêк)ö`+šþ(ö`;('ïMŠ8ØoÔ-J2¨»øUì Ô~P¨ø T‰Söçñ„wp Æãÿu$«²$Æ~;ÆÃWÉ.üŽ#}Ÿû’ž¹ÔÄáßÆÚ~ã§;ãñ«ïÑ¢ÿfŒ½ãQ¤Ÿ ìƒ½Òÿói^‡ç^4½*Š=Ø'ýÿòÛzp{w±EÅÍ€:ZÕ´j:8¨äà0 ~ƒ@ÕGŽ•¢Ž®»æC¥ÔÔjÎqD€U<`® ×Ø1À§pv€åj+ >ª1 „‚&éÿá†Þ•è¼Á´P3ÕP)óA@}Ì U0çÔBÀ,PóZ€ïf ·̝˜mœ0?±¹d™Ÿ¯eêØéÿÿTMëmŸ¤¹æ‚< ù  ‚"PJ@)Ø
-¶í ì å ì• 
-Tƒ°ìµ`/¨û@=h  	ìÍ  m ‡Àapt€NptnÐŽãà8	NÓà8΁ó ô~`pŒ‚1pŒƒ	0	¦À4˜³`¸à˜à2¸–À2XWy8Ñ'<—$³O#É\À3H2xòHæž7’…€§Œd1àÙ"Y
-x¢Hn<G$Ë OÉrPv‚JPªA
-ØvƒZ°ìu`¨
- 4ý ´€Vp ´vp‡AèGAtnp'ÀIp
-œgÀYpœ`ÍtŽôÿâG:ºj-`hI0L1éà=ÌíÁ1fþó Ÿp[)¶ö ¿j'Ø:Í–b0›­QÀUæ,è‚vœs`
-LƒIp‰ãŽ‚Ї6ÆÀZ/ØØ‘©`‡jÕ`'¨ù’ª]ç1£Wu”‚#|âÐKü‚eÊÁ°Ô~Æ2…< ®r᜶¸™L=áqŒ€`Œ‹`L€I0¦Á˜sÀ—À<X —~Ç"ðÀX+€Š²äÜRQ–Š²“¥˜,Åd)&K1YŠÉRL–b²“¥˜,Åd)&K1YŠÉRL–b²Ô‘¥Ž,ud©#KYêÈRG–:²Ô‘¥Ž,ud©#KYêÈRG–:²Ô‘¥Ž,ud©#KYêÈRG–:²Ô‘¥Ž,ud©#‹m-Åd)&K1YŠÉRL–b²=€Š²T”¥¢,e©(KEY*ÊRQ–Š²T”í} ¤ Uf©2K•Y2mÉ´%Ó–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´Ã@gž†3­€šÎ”b@éföƒv¹Vq[¯O—–81Ô%Nu‰C]<âĆºFÄ„¡®1a¨ëAœâÄ'†81ĉ!NqbˆCœâÄ'†81Ä„!&1aˆ	CLb†˜0Ä„!&1aˆ	CLbÂë…¹’ê|KoO†ºÌÕÉc7¨L™fÀóxFŸþuÀôQœ¹ÉCË0-e0RˆmClbÛÛ†Ø6Ķ!¶
-±mˆÑÃNI{G¯€
-±rˆ•C¬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˜±ª@¿²4€FÐ	Ž‚$èÝ œ§ÁptȍG‡ô;´µ¡·pœç@/8)7þì±w¤@ŸÜøV“jýrãïþY·æ€<pȍo¿¡{/0†À0À(Á8˜ “`
-LƒY-¯pduòíîTŒ+
-1VÞŠñáŸÅxú•›ñ;­1ž‰ñɶ7~ãæßǸEøÂxŒ—Êc¼üÝ_ˆ×¦«_Œ×¡«w¢é?‰ñê­÷S1þ˜_½£73–À2XWiN9@@È	Ã!‹²úhJѦ8ž+닯ª¶€BPŠA	([Á6°ì å 
-ì¹²úÖWô| ”ñm:é'	«A
-Øvm·íÚd£«–¨”ÕwŸÒSՁY}ÿo4l- ^VôÕè¯%öƒ MnÖ¼§;V¹Yتa; ±•8hg%N šX‰S€ÖUâ8+k_øwýØ ·”½à°ÜÜ>ª{Ïqƒz´³G ·D§Ülø˜BÏ-¡·O§-Ñ-kÏ|Þ‘µOÌè^:O	ÚT‰Q at s*1údí3=zÈEÐh…%À ¬ýQ6zô³²öh3>iðP?1&eía•†4[;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ßlj~Ÿ¬gšu/f𱏏}ü1YÿÆŠ#/Ì,è^œãcKù¤ÖÇþˆ¬?|M¡ËéÏ€yyéö€#/_îwÄÿÈ»º[ø+ at 3MÎ}W^ºõ¦îÕƹ–¸Žý¢Üþå—ùâgŒ#¯Á9‘oDêƒe¹ý¾¨¦?¤6Â/Q.a«¤‡ÕˆðKDB£„Ü)ªÔØ'Â>ö‰ðKÄ,1KE˜&Â4‘ž¹à°ˆ©*Â4¦‰0M„i¢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`½È81š8,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”ô7žQ­	Œƒ’~Ü®­œÌ'þT£‹“ñ o.2,)}ŸÌ¢¤ß-ÖCè
-ÅÅæó„†v‘a­a²$ýýçTcUdtf` ©5’þÅ_ë^V•&!é^Cº3&<ÃzË”HúçÏë^²jèû}û€77hð†Á¦\î–>¡cƒA1ÄTËݝպ·FîVæ:r·÷É/~\5oöÈÝ{šƒsŽ0r÷k¿TeŸi»¯ézÚ0’—2mZd³w«îÀ G˜6ÙÑa7XÅ`ƒ7Œ¾ŸÑ±7²9ý=«¼aº ¦1tóÞ0äÒЪ3¬ÔÍ)Ù\þº~Œ¦aÍih…:Y†Æ–¡¡fèZ††ÍߪЏá?C-Ìe¨ÃÖÐõ3¬÷
->0ã²ù©Ëú‰	.\Ǟ怡ághßÁ††š¡=aèÿš†¦aMlp˜ÁÔ_|eÔWj¤«²yûçúVÆ‘_‰}õèsŠl~ëMÝÊ’Íÿûne˽êÝÊ‘{£õº•+÷®·èVžÜ{%­[	¹÷õïêÖ¹÷½êV¾Üß}]·
-äþS¿Ö
-åþ­/ëV‘Ü¿ß­[ÅrÿßÚt«Dœy [¥òà7›uk+е•æ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ÒÎTm8¢2ÁN3vµcÑ+I½É¤O=J<™v&Çñx’ô•“¾Æžät’i›IšñN3Û¤3q¦w?¿üóaß³wïî9ßß¹{~ÇÉ~üƒ,ÇÉrÄqJâ?YÉá,'Ï-@ka6Z>a6ÈAëBÛI˜òÐ’h;`Ú8š†zr>ÚE´<Bý¢B´)4½T(F›GË!,»ÐÐô6JÁn´«hY„{À^´54}„2°/ËÉ~¬Í!,hGb­û:a%¨B[B[#¬ûÑ–ÑV	k at m–““hA»FXêÑ:Ñ<Âp Öüb´ÂFЄV‚v•°D«G[&<ZÐŽ¡]!lmhôs÷áaÐŽvm‘°t¢Ds	€£hçÐ.vn´Q´ÂpíÚ<aG›E›#ì}hsh³„'ÀI4ƨ{†° 1FÝÓ„§À š‡6Exœ‰µ(íáYp­m’p£õ MŽ€ZÚEÂó`mmœðCK¡jÃE4|Ú­§èE'Ñ.¡ê
+M¡ièåõafдR„Úshú¼zkÚ‰q—äzYhÄ: .¹Õ­¥ƒ·„¦}pŽP~m'šv‰šf-í¡îZšv§š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 N€LŽò7èdmph_i'jïj·ëxè@éêÐê˜ãˆ «x(À\®°c€Oàì ËäV@~dc@
+eäÇi}2%Ðyƒi3 g²; S惀ü˜A²"`Î	È…€Y* æµ ßÌ„n˜;<0Û8;`~bsÉ*?_«Ô±ã2ò³Ÿ«¦ùv at R‰„†¹ $ÀN
+@!(Å ì¥`7Øö‚2°”ƒ
+P	ª@5Øj at -¨
+à hM ‡@h‡A;è à8
+º@7èÇÀqÐúÀ	pôƒp
+‚Óà8΁!0F@
+œ£àÁ˜—À˜3`́y° .,‚%p,ƒ«`xàXkà:/'ú†"€÷’d6àm$™xI& oɝ€÷dà-#Yx·H– Þ(’¥€÷ˆäÀÛC²ìå T‚*P
+öƒPê@=h @#hÍà 8Z at +h‡A;è à8
+ºA8’à8è'ÀIÐÀ)0Nƒ3à,8΃QpèHçÈȯÿK{W-°ԁ6c$“vNècn¿N0óŸ#„û9Jqt TýUëçh#ÅÂlŽ& ?T™3 Ú 8.ƒY0fÀ"ç­`mL‚i´!°АÙGƒjU T€’ª}š_ÄŒÞÕEPºøÄi ·6
+øË”:P ?c™N>®rãíœqŽx˜L#áU:qŒƒ‹`L‚K`
+Lƒ0æÀ<X —Á¸–~Ç
+ðÀ5°
+Ö esKFY2Ê’L–d²$“%™,ÉdI&K2Y’É’L–d²$“%™,ÉdI&K2Y’É’G–<²ä‘%,ydÉ#KYòÈ’G–<²ä‘%,ydÉ#KYòÈ’G–<²ä‘%,ydÉ#KYòÈ’G–<²ä‘%,¶µ$“%™,ÉdI&K2Y’Éö2Ê’Q–Œ²d”%£,eÉ(KFY2Ê’Qvƒd™%Ë,YfiËH[FÚ2Ò–‘¶Œ´e¤-#miËH[FÚ2Ò–‘¶Œ´e¤-#miËH[FÚ2Ò–‘¶Œ´e¤-#miËH‡ŒtÈH‡:c¦$µ;­š<S©ÝKŠ7aQ^M3½øTS\_î4‰É²Ì) É®9s\R­?Ö£JÐ
+ôÕ¯íà(Й·áL §3{@ u3‡@‡ÜØ÷¢ÞŸ.-qb¨Jœê2'†ºxĉ!&uˆ	C]bÂP׃81ĉ!NqbˆCœâÄ'†81ĉ!Nqbˆ	CLb†˜0Ä„!&1aˆ	CLb†˜0Ä„!Ös%ÕècáÉP—¹:yÔ€ZÀä‘i¼gôí_;L_Å™›<´ÓR#…Ø6Ķ!¶
+±mˆmClbÛÛ†=ì‘Ô‰ïé!V±rˆ•C¬bå+‡X9ÄÅa¯¤†.êÇtr[åËsA°"Èèmè
+]ÔŒ£'ãûg‡“’Zù{Õ°|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¯§hQ‚WÏ•Í•çTÛòA(E ”€] ì{A¨å WÖÿáKz½}`'Ø÷餟$¬Õ`?¨Zn«Zd£ª–¨õ·=½Th’õÿù–†Í 4ÊúOþ]5êk‰Cà0h—ÛÕÿ¤
+G@›Ü.¨Ñ°PØJœ ”³ý€"Vâ t•8
+ÎÈÆóV?vP[JŒƒ!pTnï>£­gy@}ÊY‰.@á-Ñ#·›nè)ÔÜúøTÚ½²ñ±
+G6>>ª­Tž”©€âTbËÆÓ‡õ”K`P
+Kœ£²‘y_=zÙxøÙø¢Á¶~â2˜‘W
+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òb—pJ¤À‘ú`U^ˆ~¥šþ3´~‰r	Û$=öÚŠ"ü1 QBî–hö‰°O„}"ü1KEÌR¦‰0M¤WÞpXÄTašÓD˜&Â4Qß‹-¢¹S»ÿ²çò]Šc8δb©ˆê~„_"üah¿ÜÙ÷½5üá—#E”ó#œáœçD.Â>vŒjåNëW¹óÊÏÙ긣§_/…E£zÙê›Ð$:*[gŸÑÃEx-Â>QR¶Æ¾ª
+½€É-br‹0\Ääiù}P¶æÊô<¼iù¯Ex(:+[Ÿ×V¶‰ºõÆÇdëÿy6­£Ê–÷S
+™#­™OHºCgÛHËê+`ZÒÉ÷UÓ:æŠ Ö‹\€£%€Ã"&žsEL2†‹Xc{:Ã1Dž¤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*é/¼«!]—áz™fI¿öˆjÁè—ô›MªQÊÉ\ñÀ¿u[5ª8°s‘aIa¨ûdV$ývŽžBUÈ8²ý©ABC¹È°Ö0Y’þ?TU‘Ñ™Ž0­É—ô¯ÿV[YUš„¤ßÕòŽ¡:cvÏ°Þ2Å’þÕ'´•Q5Ô}Œî>à
+üað†)“»%Wõdb0ˆÁ ƒ˜*¹[^ª­ÕñÑÿ9rwÈ‹ñÌcª1ð¦NîÞÓá18ÇàÓ,w_ý¥j,ûL“ÜýÂ÷5¤'
+.1Œ´i•í¡„6`ƒ#L»lk·¬b°ŠÁF÷g4¤ïMlÏÝÓó°ŠÁæ8À4†jžÁ†±4”ê+usJ¶WÿB?FÑΰæ4”Â•,CaËPP3Ô%CÁÀœ—íß-ҏá?C.ÌeÈÃÖPõ3¬÷
+>0S²ýÉYýÄ47®}OqÀPð3”ï‹`CAÍPž0ÔÿE	CÑΰ&68Ì`jƒ¯¾2ê+5ÒuÙ~áçº+ãȃWÏžz¸©¡Èö·ßУ,Ù~ïz”-÷ªõ(GîMTéQ®Ü»Y¯GyrïÅÏêQBî}ù{z´Cî}MvÊýš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