[cig-commits] r19688 - in seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src: cuda specfem3D
joseph.charles at geodynamics.org
joseph.charles at geodynamics.org
Mon Feb 27 12:01:44 PST 2012
Author: joseph.charles
Date: 2012-02-27 12:01:44 -0800 (Mon, 27 Feb 2012)
New Revision: 19688
Modified:
seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/cuda/specfem3D_gpu_cuda_method_stubs.c
seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/compute_forces_acoustic.F90
seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/compute_forces_elastic.F90
Log:
fixes the previous commit in which some git messages remained
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/cuda/specfem3D_gpu_cuda_method_stubs.c
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/cuda/specfem3D_gpu_cuda_method_stubs.c 2012-02-27 19:29:48 UTC (rev 19687)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/cuda/specfem3D_gpu_cuda_method_stubs.c 2012-02-27 20:01:44 UTC (rev 19688)
@@ -154,66 +154,25 @@
//
void FC_FUNC_(compute_coupling_fluid_cmb_cuda,
- COMPUTE_COUPLING_FLUID_CMB_CUDA)(
- long* Mesh_pointer_f,
- int* ibool_crust_mantle,
- int* ibelm_bottom_crust_mantle,
- realw* normal_top_outer_core,
- realw* jacobian2D_top_outer_core,
- realw* wgllwgll_xy,
- int* ibool_outer_core,
- int* ibelm_top_outer_core,
- int* SIMULATION_TYPE,
- int* NSPEC_TOP) {}
+ COMPUTE_COUPLING_FLUID_CMB_CUDA)(long* Mesh_pointer_f) {}
void FC_FUNC_(compute_coupling_fluid_icb_cuda,
- COMPUTE_COUPLING_FLUID_ICB_CUDA)(
- long* Mesh_pointer_f,
- int* ibool_inner_core,
- int* ibelm_top_inner_core,
- realw* normal_bottom_outer_core,
- realw* jacobian2D_bottom_outer_core,
- realw* wgllwgll_xy,
- int* ibool_outer_core,
- int* ibelm_bottom_outer_core,
- int* SIMULATION_TYPE,
- int* NSPEC_BOTTOM) {}
+ COMPUTE_COUPLING_FLUID_ICB_CUDA)(long* Mesh_pointer_f) {}
void FC_FUNC_(compute_coupling_cmb_fluid_cuda,
- COMPUTE_COUPLING_CMB_FLUID_CUDA)(
- long* Mesh_pointer_f,
- int* ibool_crust_mantle,
- int* ibelm_bottom_crust_mantle,
- realw* normal_top_outer_core,
- realw* jacobian2D_top_outer_core,
- realw* wgllwgll_xy,
- int* ibool_outer_core,
- int* ibelm_top_outer_core,
- double* RHO_TOP_OC,
- realw* minus_g_cmb,
- int* GRAVITY_VAL,
- int* SIMULATION_TYPE,
- int* NSPEC_BOTTOM) {}
+ COMPUTE_COUPLING_CMB_FLUID_CUDA)(long* Mesh_pointer_f,
+ double RHO_TOP_OC,
+ realw minus_g_cmb,
+ int GRAVITY_VAL) {}
void FC_FUNC_(compute_coupling_icb_fluid_cuda,
- COMPUTE_COUPLING_ICB_fluid_CUDA)(
- long* Mesh_pointer_f,
- int* ibool_inner_core,
- int* ibelm_top_inner_core,
- realw* normal_bottom_outer_core,
- realw* jacobian2D_bottom_outer_core,
- realw* wgllwgll_xy,
- int* ibool_outer_core,
- int* ibelm_bottom_outer_core,
- double* RHO_BOTTOM_OC,
- realw* minus_g_icb,
- int* GRAVITY_VAL,
- int* SIMULATION_TYPE,
- int* NSPEC_TOP) {}
+ COMPUTE_COUPLING_ICB_FLUID_CUDA)(long* Mesh_pointer_f,
+ double RHO_BOTTOM_OC,
+ realw minus_g_icb,
+ int GRAVITY_VAL) {}
void FC_FUNC_(compute_coupling_ocean_cuda,
- COMPUTE_COUPLING_OCEAN_CUDA)(long* Mesh_pointer_f,
- int* SIMULATION_TYPE) {}
+ COMPUTE_COUPLING_OCEAN_CUDA)(long* Mesh_pointer_f) {}
//
@@ -393,6 +352,7 @@
int* h_islice_selected_rec,int* h_ispec_selected_rec,
int* nrec,int* nrec_local, int* nadj_rec_local,
int* NSPEC_CRUST_MANTLE, int* NGLOB_CRUST_MANTLE,
+ int* NGLOB_CRUST_MANTLE_OCEANS,
int* NSPEC_OUTER_CORE, int* NGLOB_OUTER_CORE,
int* NSPEC_INNER_CORE, int* NGLOB_INNER_CORE,
int* SIMULATION_TYPE,
@@ -545,29 +505,34 @@
void FC_FUNC_(prepare_crust_mantle_device,
PREPARE_CRUST_MANTLE_DEVICE)(long* Mesh_pointer_f,
- realw* h_xix, realw* h_xiy, realw* h_xiz,
- realw* h_etax, realw* h_etay, realw* h_etaz,
- realw* h_gammax, realw* h_gammay, realw* h_gammaz,
- realw* h_rho,
- realw* h_kappav, realw* h_muv,
- realw* h_kappah, realw* h_muh,
- realw* h_eta_aniso,
- realw* h_rmass,
- int* h_ibool,
- realw* h_xstore, realw* h_ystore, realw* h_zstore,
- int* h_ispec_is_tiso,
- realw *c11store,realw *c12store,realw *c13store,
- realw *c14store,realw *c15store,realw *c16store,
- realw *c22store,realw *c23store,realw *c24store,
- realw *c25store,realw *c26store,realw *c33store,
- realw *c34store,realw *c35store,realw *c36store,
- realw *c44store,realw *c45store,realw *c46store,
- realw *c55store,realw *c56store,realw *c66store,
- int* num_phase_ispec,
- int* phase_ispec_inner,
- int* nspec_outer,
- int* nspec_inner
- ) {}
+ realw* h_xix, realw* h_xiy, realw* h_xiz,
+ realw* h_etax, realw* h_etay, realw* h_etaz,
+ realw* h_gammax, realw* h_gammay, realw* h_gammaz,
+ realw* h_rho,
+ realw* h_kappav, realw* h_muv,
+ realw* h_kappah, realw* h_muh,
+ realw* h_eta_aniso,
+ realw* h_rmass,
+ realw* h_normal_top_crust_mantle,
+ int* h_ibelm_top_crust_mantle,
+ int* h_ibelm_bottom_crust_mantle,
+ int* h_ibool,
+ realw* h_xstore, realw* h_ystore, realw* h_zstore,
+ int* h_ispec_is_tiso,
+ realw *c11store,realw *c12store,realw *c13store,
+ realw *c14store,realw *c15store,realw *c16store,
+ realw *c22store,realw *c23store,realw *c24store,
+ realw *c25store,realw *c26store,realw *c33store,
+ realw *c34store,realw *c35store,realw *c36store,
+ realw *c44store,realw *c45store,realw *c46store,
+ realw *c55store,realw *c56store,realw *c66store,
+ int* num_phase_ispec,
+ int* phase_ispec_inner,
+ int* nspec_outer,
+ int* nspec_inner,
+ int* NSPEC2D_TOP_CM,
+ int* NSPEC2D_BOTTOM_CM
+ ) {}
void FC_FUNC_(prepare_outer_core_device,
PREPARE_OUTER_CORE_DEVICE)(long* Mesh_pointer_f,
@@ -576,30 +541,40 @@
realw* h_gammax, realw* h_gammay, realw* h_gammaz,
realw* h_rho, realw* h_kappav,
realw* h_rmass,
+ realw* h_normal_top_outer_core,
+ realw* h_normal_bottom_outer_core,
+ realw* h_jacobian2D_top_outer_core,
+ realw* h_jacobian2D_bottom_outer_core,
+ int* h_ibelm_top_outer_core,
+ int* h_ibelm_bottom_outer_core,
int* h_ibool,
realw* h_xstore, realw* h_ystore, realw* h_zstore,
int* num_phase_ispec,
int* phase_ispec_inner,
int* nspec_outer,
- int* nspec_inner
+ int* nspec_inner,
+ int* NSPEC2D_TOP_OC,
+ int* NSPEC2D_BOTTOM_OC
) {}
void FC_FUNC_(prepare_inner_core_device,
PREPARE_INNER_CORE_DEVICE)(long* Mesh_pointer_f,
- realw* h_xix, realw* h_xiy, realw* h_xiz,
- realw* h_etax, realw* h_etay, realw* h_etaz,
- realw* h_gammax, realw* h_gammay, realw* h_gammaz,
- realw* h_rho, realw* h_kappav, realw* h_muv,
- realw* h_rmass,
- int* h_ibool,
- realw* h_xstore, realw* h_ystore, realw* h_zstore,
- realw *c11store,realw *c12store,realw *c13store,
- realw *c33store,realw *c44store,
- int* h_idoubling_inner_core,
- int* num_phase_ispec,
- int* phase_ispec_inner,
- int* nspec_outer,
- int* nspec_inner) {}
+ realw* h_xix, realw* h_xiy, realw* h_xiz,
+ realw* h_etax, realw* h_etay, realw* h_etaz,
+ realw* h_gammax, realw* h_gammay, realw* h_gammaz,
+ realw* h_rho, realw* h_kappav, realw* h_muv,
+ realw* h_rmass,
+ int* h_ibelm_top_inner_core,
+ int* h_ibool,
+ realw* h_xstore, realw* h_ystore, realw* h_zstore,
+ realw *c11store,realw *c12store,realw *c13store,
+ realw *c33store,realw *c44store,
+ int* h_idoubling_inner_core,
+ int* num_phase_ispec,
+ int* phase_ispec_inner,
+ int* nspec_outer,
+ int* nspec_inner,
+ int* NSPEC2D_TOP_IC) {}
void FC_FUNC_(prepare_fields_elastic_device,
PREPARE_FIELDS_ELASTIC_DEVICE)(long* Mesh_pointer_f,
@@ -673,6 +648,15 @@
void FC_FUNC_(transfer_fields_oc_to_device,
TRANSFER_FIELDS_OC_TO_DEVICE)(int* size, realw* displ, realw* veloc, realw* accel,long* Mesh_pointer_f) {}
+void FC_FUNC_(transfer_coupling_fields_fluid_cmb_icb_to_device,
+ TRANSFER_COUPLING_FIELDS_FLUID_CMB_ICB_TO_DEVICE)(int* size_oc, int* size_cm, int* size_ic, realw* displ_cm, realw* displ_ic, realw* accel, long* Mesh_pointer_f) {}
+
+void FC_FUNC_(transfer_coupling_fields_cmb_icb_fluid_to_device,
+ TRANSFER_COUPLING_FIELDS_CMB_ICB_FLUID_TO_DEVICE)(int* size_oc, int* size_cm, int* size_ic, realw* displ_cm, realw* displ_ic, realw* accel_cm, realw* accel_ic, realw* accel_oc, long* Mesh_pointer_f) {}
+
+void FC_FUNC_(transfer_coupling_fields_cmb_ocean_to_device,
+ TRANSFER_COUPLING_FIELDS_CMB_OCEAN_TO_DEVICE)(int* size, realw* accel, long* Mesh_pointer_f) {}
+
void FC_FUNC_(transfer_b_fields_cm_to_device,
TRANSFER_FIELDS_B_CM_TO_DEVICE)(int* size, realw* b_displ, realw* b_veloc, realw* b_accel,
long* Mesh_pointer_f) {}
@@ -685,6 +669,15 @@
TRANSFER_FIELDS_B_OC_TO_DEVICE)(int* size, realw* b_displ, realw* b_veloc, realw* b_accel,
long* Mesh_pointer_f) {}
+void FC_FUNC_(transfer_coupling_b_fields_fluid_cmb_icb_to_device,
+ TRANSFER_COUPLING_B_FIELDS_FLUID_CMB_ICB_TO_DEVICE)(int* size_oc, int* size_cm, int* size_ic, realw* b_displ_cm, realw* b_displ_ic, realw* b_accel, long* Mesh_pointer_f) {}
+
+void FC_FUNC_(transfer_coupling_b_fields_cmb_icb_fluid_to_device,
+ TRANSFER_COUPLING_B_FIELDS_CMB_ICB_FLUID_TO_DEVICE)(int* size_oc, int* size_cm, int* size_ic, realw* b_displ_cm, realw* b_displ_ic, realw* b_accel_cm, realw* b_accel_ic, realw* b_accel_oc, long* Mesh_pointer_f) {}
+
+void FC_FUNC_(transfer_coupling_b_fields_cmb_ocean_to_device,
+ TRANSFER_COUPLING_B_FIELDS_CMB_OCEAN_TO_DEVICE)(int* size, realw* b_accel, long* Mesh_pointer_f) {}
+
void FC_FUNC_(transfer_fields_cm_from_device,
TRANSFER_FIELDS_CM_FROM_DEVICE)(int* size, realw* displ, realw* veloc, realw* accel,long* Mesh_pointer_f) {}
@@ -694,6 +687,15 @@
void FC_FUNC_(transfer_fields_oc_from_device,
TRANSFER_FIELDS_OC_FROM_DEVICE)(int* size, realw* displ, realw* veloc, realw* accel,long* Mesh_pointer_f) {}
+void FC_FUNC_(transfer_coupling_fields_fluid_cmb_icb_from_device,
+ TRANSFER_COUPLING_FIELDS_FLUID_CMB_ICB_FROM_DEVICE)(int* size_oc, int* size_cm, int* size_ic, realw* displ_cm, realw* displ_ic, realw* accel, long* Mesh_pointer_f) {}
+
+void FC_FUNC_(transfer_coupling_fields_cmb_icb_fluid_from_device,
+ TRANSFER_COUPLING_FIELDS_CMB_ICB_FLUID_FROM_DEVICE)(int* size_oc, int* size_cm, int* size_ic, realw* displ_cm, realw* displ_ic, realw* accel_cm, realw* accel_ic, realw* accel_oc, long* Mesh_pointer_f) {}
+
+void FC_FUNC_(transfer_coupling_fields_cmb_ocean_from_device,
+ TRANSFER_COUPLING_FIELDS_CMB_OCEAN_FROM_DEVICE)(int* size, realw* accel, long* Mesh_pointer_f) {}
+
void FC_FUNC_(transfer_b_fields_cm_from_device,
TRANSFER_B_FIELDS_CM_FROM_DEVICE)(int* size, realw* b_displ, realw* b_veloc, realw* b_accel,
long* Mesh_pointer_f) {}
@@ -706,46 +708,15 @@
TRANSFER_B_FIELDS_OC_FROM_DEVICE)(int* size, realw* b_displ, realw* b_veloc, realw* b_accel,
long* Mesh_pointer_f) {}
-void FC_FUNC_(transfer_coupling_fields_fluid_cmb_icb_to_device,
- TRANSFER_COUPLING_FIELDS_FLUID_CMB_ICB_TO_DEVICE)(int* size_oc, int* size_cm, int* size_cm,
- realw* displ_cm, realw* displ_ic, realw* accel,
- long* Mesh_pointer_f) {}
-
-void FC_FUNC_(transfer_coupling_b_fields_fluid_cmb_icb_to_device,
- TRANSFER_COUPLING_B_FIELDS_FLUID_CMB_ICB_TO_DEVICE)(int* size_oc, int* size_cm, int* size_ic,
- realw* b_displ_cm, realw* b_displ_ic, realw* b_accel,
- long* Mesh_pointer_f) {}
-
-void FC_FUNC_(transfer_coupling_fields_fluid_cmb_icb_from_device,
- TRANSFER_COUPLING_FIELDS_FLUID_CMB_ICB_FROM_DEVICE)(int* size_oc, int* size_cm, int* size_ic,
- realw* displ_cm, realw* displ_ic, realw* accel,
- long* Mesh_pointer_f) {}
-
void FC_FUNC_(transfer_coupling_b_fields_fluid_cmb_icb_from_device,
- TRANSFER_COUPLING_B_FIELDS_FLUID_CMB_ICB_FROM_DEVICE)(int* size_oc, int* size_cm, int* size_ic,
- realw* b_displ_cm, realw* b_displ_ic, realw* b_accel,
- long* Mesh_pointer_f) {}
+ TRANSFER_COUPLING_B_FIELDS_FLUID_CMB_icb_FROM_DEVICE)(int* size_oc, int* size_cm, int* size_ic, realw* b_displ_cm, realw* b_displ_ic, realw* b_accel, long* Mesh_pointer_f) {}
-void FC_FUNC_(transfer_coupling_fields_cmb_icb_fluid_to_device,
- TRANSFER_COUPLING_FIELDS_CMB_ICB_FLUID_TO_DEVICE)(int* size_oc, int* size_cm, int* size_ic,
- realw* displ_cm, realw* displ_ic, realw* accel_cm,
- realw* accel_ic, realw* accel_oc, long* Mesh_pointer_f) {}
-
-void FC_FUNC_(transfer_coupling_b_fields_cmb_icb_fluid_to_device,
- TRANSFER_COUPLING_B_FIELDS_CMB_ICB_FLUID_TO_DEVICE)(int* size_oc, int* size_cm, int* size_ic,
- realw* b_displ_cm, realw* b_displ_ic, realw* b_accel_cm,
- realw* b_accel_ic, realw* b_accel_oc, long* Mesh_pointer_f) {}
-
-void FC_FUNC_(transfer_coupling_fields_cmb_icb_fluid_from_device,
- TRANSFER_COUPLING_FIELDS_CMB_ICB_FLUID_FROM_DEVICE)(int* size_oc, int* size_cm, int* size_ic,
- realw* displ_cm, realw* displ_ic, realw* accel_cm,
- realw* accel_ic, realw* accel_oc, long* Mesh_pointer_f) {}
-
void FC_FUNC_(transfer_coupling_b_fields_cmb_icb_fluid_from_device,
- TRANSFER_COUPLING_B_FIELDS_CMB_ICB_FLUID_FROM_DEVICE)(int* size_oc, int* size_cm, int* size_ic,
- realw* b_displ_cm, realw* b_displ_ic, realw* b_accel_cm,
- realw* b_accel_ic, realw* b_accel_oc, long* Mesh_pointer_f) {}
+ TRANSFER_COUPLING_B_FIELDS_CMB_ICB_FLUID_FROM_DEVICE)(int* size_oc, int* size_cm, int* size_ic, realw* b_displ_cm, realw* b_displ_ic, realw* b_accel_cm, realw* b_accel_ic, realw* b_accel_oc, long* Mesh_pointer_f) {}
+void FC_FUNC_(transfer_coupling_b_fields_cmb_ocean_from_device,
+ TRANSFER_COUPLING_B_FIELDS_CMB_OCEAN_FROM_DEVICE)(int* size, realw* b_accel, long* Mesh_pointer_f) {}
+
void FC_FUNC_(transfer_accel_cm_to_device,
TRANSFER_ACCEL_CM_TO_DEVICE)(int* size, realw* accel,long* Mesh_pointer_f) {}
@@ -774,7 +745,7 @@
TRANSFER_ACCEL_CM_FROM_DEVICE)(int* size, realw* accel,long* Mesh_pointer_f) {}
void FC_FUNC_(transfer_b_accel_cm_from_device,
- TRANSFER_B_ACCEL_CM_FROM_DEVICE)(int* size, realw* b_accel,long* Mesh_pointer_f) {}
+ TRNASFER_B_ACCEL_CM_FROM_DEVICE)(int* size, realw* b_accel,long* Mesh_pointer_f) {}
void FC_FUNC_(transfer_accel_ic_from_device,
TRANSFER_ACCEL_IC_FROM_DEVICE)(int* size, realw* accel,long* Mesh_pointer_f) {}
@@ -849,57 +820,9 @@
void FC_FUNC_(transfer_kernels_noise_to_host,
TRANSFER_KERNELS_NOISE_TO_HOST)(long* Mesh_pointer,
- realw* h_Sigma_kl,
- int* NSPEC_AB) {}
+ realw* h_Sigma_kl,
+ int* NSPEC) {}
-void FC_FUNC_(transfer_fields_ac_to_device,
- TRANSFER_FIELDS_AC_TO_DEVICE)(
- int* size,
- realw* potential_acoustic,
- realw* potential_dot_acoustic,
- realw* potential_dot_dot_acoustic,
- long* Mesh_pointer_f) {}
-
-void FC_FUNC_(transfer_b_fields_ac_to_device,
- TRANSFER_B_FIELDS_AC_TO_DEVICE)(
- int* size,
- realw* b_potential_acoustic,
- realw* b_potential_dot_acoustic,
- realw* b_potential_dot_dot_acoustic,
- long* Mesh_pointer_f) {}
-
-void FC_FUNC_(transfer_fields_ac_from_device,TRANSFER_FIELDS_AC_FROM_DEVICE)(
- int* size,
- realw* potential_acoustic,
- realw* potential_dot_acoustic,
- realw* potential_dot_dot_acoustic,
- long* Mesh_pointer_f) {}
-
-void FC_FUNC_(transfer_b_fields_ac_from_device,
- TRANSFER_B_FIELDS_AC_FROM_DEVICE)(
- int* size,
- realw* b_potential_acoustic,
- realw* b_potential_dot_acoustic,
- realw* b_potential_dot_dot_acoustic,
- long* Mesh_pointer_f) {}
-
-void FC_FUNC_(transfer_dot_dot_from_device,
- TRANSFER_DOT_DOT_FROM_DEVICE)(int* size, realw* potential_dot_dot_acoustic,long* Mesh_pointer_f) {}
-
-void FC_FUNC_(transfer_b_dot_dot_from_device,
- TRANSFER_B_DOT_DOT_FROM_DEVICE)(int* size, realw* b_potential_dot_dot_acoustic,long* Mesh_pointer_f) {}
-
-void FC_FUNC_(transfer_kernels_ac_to_host,
- TRANSFER_KERNELS_AC_TO_HOST)(long* Mesh_pointer,
- realw* h_rho_ac_kl,
- realw* h_kappa_ac_kl,
- int* NSPEC_AB) {}
-
-void FC_FUNC_(transfer_kernels_hess_el_tohost,
- TRANSFER_KERNELS_HESS_EL_TOHOST)(long* Mesh_pointer,
- realw* h_hess_kl,
- int* NSPEC_AB) {}
-
void FC_FUNC_(transfer_kernels_hess_cm_tohost,
TRANSFER_KERNELS_HESS_CM_TOHOST)(long* Mesh_pointer,
realw* h_hess_kl,
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/compute_forces_acoustic.F90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/compute_forces_acoustic.F90 2012-02-27 19:29:48 UTC (rev 19687)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/compute_forces_acoustic.F90 2012-02-27 20:01:44 UTC (rev 19688)
@@ -121,7 +121,7 @@
! computes additional contributions to acceleration field
if( iphase == 1 ) then
- <<<<<<< HEAD
+
! Stacey absorbing boundaries
if(NCHUNKS_VAL /= 6 .and. ABSORBING_CONDITIONS) call compute_stacey_outer_core()
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/compute_forces_elastic.F90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/compute_forces_elastic.F90 2012-02-27 19:29:48 UTC (rev 19687)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/compute_forces_elastic.F90 2012-02-27 20:01:44 UTC (rev 19688)
@@ -486,33 +486,25 @@
! couples ocean with crust mantle
! (updates acceleration with ocean load approximation)
if(OCEANS_VAL) then
-<<<<<<< HEAD
- call load_CPU_elastic()
-
- call compute_coupling_ocean(accel_crust_mantle,b_accel_crust_mantle, &
- rmass_crust_mantle,rmass_ocean_load,normal_top_crust_mantle, &
- ibool_crust_mantle,ibelm_top_crust_mantle, &
- updated_dof_ocean_load, &
- SIMULATION_TYPE,NSPEC2D_TOP(IREGION_CRUST_MANTLE))
- call load_GPU_elastic()
-=======
if(.NOT. GPU_MODE) then
! on CPU
+ call load_CPU_elastic()
+
call compute_coupling_ocean(accel_crust_mantle,b_accel_crust_mantle, &
rmass_crust_mantle,rmass_ocean_load,normal_top_crust_mantle, &
ibool_crust_mantle,ibelm_top_crust_mantle, &
updated_dof_ocean_load, &
SIMULATION_TYPE,NSPEC2D_TOP(IREGION_CRUST_MANTLE))
-
+ call load_GPU_elastic()
+
else
! on GPU
call load_GPU_elastic_coupling_ocean()
call compute_coupling_ocean_cuda(Mesh_pointer)
-
+
call load_CPU_elastic_coupling_ocean()
endif
->>>>>>> adds cuda code for coupling inner_core/outer_core, outer_core/crust_mantle and crust_mantle/ocean
endif
! Newmark time scheme:
More information about the CIG-COMMITS
mailing list