Skip to content

carenelarmat/S22449

Repository files navigation

S22449

v0.0 commit 8b9e3fbcb4c4551c70659f0cea8903e69cba6649 version 2.1 that I used for a lot of my development. Sources found in an archive on breizh that I will push on this repository as version v0.0 Change of plan. This is refused because the archive is a large file so we will only have the original sources.

wtrw:/usr/project/trevimg/carene/SPECFEM3D_22449_Current commit 6e7e7a47893ff1a5df1ea17ffb29f65fca062125 version used to run my atmospheric modeling Comparing with v0.0 pushed on the remote (git pull), got this list of modified files: CONFLICT (add/add): Merge conflict in src/specfem3D/write_seismograms.f90 CONFLICT (add/add): Merge conflict in src/specfem3D/write_output_ASCII.f90 CONFLICT (add/add): Merge conflict in src/specfem3D/specfem3D_par.f90 CONFLICT (add/add): Merge conflict in src/specfem3D/specfem3D.f90 CONFLICT (add/add): Merge conflict in src/specfem3D/read_mesh_databases.f90 CONFLICT (add/add): Merge conflict in src/specfem3D/prepare_timerun.F90 CONFLICT (add/add): Merge conflict in src/specfem3D/locate_source.f90 CONFLICT (add/add): Merge conflict in src/specfem3D/locate_receivers.f90 CONFLICT (add/add): Merge conflict in src/specfem3D/iterate_time.F90 CONFLICT (add/add): Merge conflict in src/specfem3D/create_color_image.f90 CONFLICT (add/add): Merge conflict in src/specfem3D/compute_interpolated_dva.f90 CONFLICT (add/add): Merge conflict in src/specfem3D/comp_source_time_function.f90 CONFLICT (add/add): Merge conflict in src/shared/read_topo_bathy_file.f90 CONFLICT (add/add): Merge conflict in src/shared/create_movie_shakemap_AVS_DX_GMT.f90 CONFLICT (add/add): Merge conflict in src/shared/constants.h.in CONFLICT (add/add): Merge conflict in src/shared/check_mesh_resolution.f90 CONFLICT (add/add): Merge conflict in src/meshfem3D/create_regions_mesh.f90 CONFLICT (add/add): Merge conflict in src/generate_databases/model_tomography.f90 CONFLICT (add/add): Merge conflict in src/decompose_mesh/scotch_5.1.12b/src/scotch/Makefile CONFLICT (add/add): Merge conflict in src/decompose_mesh/scotch_5.1.12b/src/libscotch/Makefile CONFLICT (file/directory): There is a directory with name src/decompose_mesh/scotch in 8b9e3fbcb4c4551c70659f0cea8903e69cba6649. Adding src/decompose_mesh/scotch as src/decompose_mesh/scotch~HEAD

About

No description, website, or topics provided.

Resources

Stars

Watchers

Forks

Releases

No releases published

Packages

No packages published