diff --git a/src/Makefile b/src/Makefile index cf0323c96d4c341f402a5e8c8339082a26951833..04b7ff659797fcc839bf8d2d9868aebcc00768fb 100644 --- a/src/Makefile +++ b/src/Makefile @@ -23,22 +23,6 @@ compute_positive_volume.o \ compute_normals.o \ create_surfaces.o \ define_bc.o \ -define_bcs/define_bc_2Dpunch.o \ -define_bcs/define_bc_2Dpunch_vert.o \ -define_bcs/define_bc_3Dpunch.o \ -define_bcs/define_bc_folding.o \ -define_bcs/define_bc_jgr.o \ -define_bcs/define_bc_model1.o \ -define_bcs/define_bc_nest.o \ -define_bcs/define_bc_parallipipede.o \ -define_bcs/define_bc_pipo.o \ -define_bcs/define_bc_riedel.o \ -define_bcs/define_bc_ritske.o \ -define_bcs/define_bc_ritske_isurf.o \ -define_bcs/define_bc_segmented_s_line.o \ -define_bcs/define_bc.sphere.o \ -define_bcs/define_bc_sphere.o \ -define_bcs/define_bc_subduction.o \ define_isostasy_bc.o \ define_surface.o \ define_cloud.o \ @@ -95,6 +79,7 @@ install: subdirs: cd CASCADE; make all + cd DEFINE_BC; make all cd NN; make all cd OCTREE; make all cd RESAMPLE; make all @@ -106,6 +91,7 @@ vtk: .PHONY: objclean objclean: cd CASCADE; make $@ + cd DEFINE_BC; make $@ cd NN; make $@ cd OCTREE; make $@ cd RESAMPLE; make $@ @@ -114,6 +100,7 @@ objclean: .PHONY: distclean distclean: objclean cd CASCADE; make $@ + cd DEFINE_BC; make $@ cd NN; make $@ cd OCTREE; make $@ cd RESAMPLE; make $@ @@ -122,6 +109,7 @@ distclean: objclean .PHONY: more-output more-output: cd CASCADE; make $@ + cd DEFINE_BC; make $@ cd NN; make $@ cd OCTREE; make $@ cd RESAMPLE; make $@ @@ -137,20 +125,4 @@ more-output: mahone:: cp -f Makefile.inc.mahone Makefile.inc -.PHONY: bc_DT065 -bc_DT065:: - cp -f define_bc_DT065.f90 define_bc.f90 - -.PHONY: bc_20090710 -bc_20090710:: - cp -f define_bc.20090710.f90 define_bc.f90 - -.PHONY: bc_18.06.2009 -bc_18.06.2009:: - cp -f define_bc.18.06.2009.f90 define_bc.f90 - -.PHONY: geodyncomp -geodyncomp:: - cp -f define_bc_2011-01-21.f90 define_bc.f90 - -# end of file +# end of file \ No newline at end of file diff --git a/src/DEFINE_BC/define_bc.18.06.2009.f90 b/src/define_bc.18.06.2009.f90 similarity index 100% rename from src/DEFINE_BC/define_bc.18.06.2009.f90 rename to src/define_bc.18.06.2009.f90 diff --git a/src/DEFINE_BC/define_bc.20090710.f90 b/src/define_bc.20090710.f90 similarity index 100% rename from src/DEFINE_BC/define_bc.20090710.f90 rename to src/define_bc.20090710.f90 diff --git a/src/DEFINE_BC/define_bc.org.f90 b/src/define_bc.org.f90 similarity index 100% rename from src/DEFINE_BC/define_bc.org.f90 rename to src/define_bc.org.f90 diff --git a/src/DEFINE_BC/define_bc.sphere.f90 b/src/define_bc.sphere.f90 similarity index 100% rename from src/DEFINE_BC/define_bc.sphere.f90 rename to src/define_bc.sphere.f90 diff --git a/src/DEFINE_BC/define_bc_2011-01-21.f90 b/src/define_bc_2011-01-21.f90 similarity index 100% rename from src/DEFINE_BC/define_bc_2011-01-21.f90 rename to src/define_bc_2011-01-21.f90 diff --git a/src/DEFINE_BC/define_bc_2Dpunch.f90 b/src/define_bc_2Dpunch.f90 similarity index 100% rename from src/DEFINE_BC/define_bc_2Dpunch.f90 rename to src/define_bc_2Dpunch.f90 diff --git a/src/DEFINE_BC/define_bc_2Dpunch_vert.f90 b/src/define_bc_2Dpunch_vert.f90 similarity index 100% rename from src/DEFINE_BC/define_bc_2Dpunch_vert.f90 rename to src/define_bc_2Dpunch_vert.f90 diff --git a/src/DEFINE_BC/define_bc_3Dpunch.f90 b/src/define_bc_3Dpunch.f90 similarity index 100% rename from src/DEFINE_BC/define_bc_3Dpunch.f90 rename to src/define_bc_3Dpunch.f90 diff --git a/src/DEFINE_BC/define_bc_DOUAR_v0.1.f90 b/src/define_bc_DOUAR_v0.1.f90 similarity index 100% rename from src/DEFINE_BC/define_bc_DOUAR_v0.1.f90 rename to src/define_bc_DOUAR_v0.1.f90 diff --git a/src/DEFINE_BC/define_bc_DT065.f90 b/src/define_bc_DT065.f90 similarity index 100% rename from src/DEFINE_BC/define_bc_DT065.f90 rename to src/define_bc_DT065.f90 diff --git a/src/DEFINE_BC/define_bc_folding.f90 b/src/define_bc_folding.f90 similarity index 100% rename from src/DEFINE_BC/define_bc_folding.f90 rename to src/define_bc_folding.f90 diff --git a/src/DEFINE_BC/define_bc_jgr.f90 b/src/define_bc_jgr.f90 similarity index 100% rename from src/DEFINE_BC/define_bc_jgr.f90 rename to src/define_bc_jgr.f90 diff --git a/src/DEFINE_BC/define_bc_model1.f90 b/src/define_bc_model1.f90 similarity index 100% rename from src/DEFINE_BC/define_bc_model1.f90 rename to src/define_bc_model1.f90 diff --git a/src/DEFINE_BC/define_bc_nest.f90 b/src/define_bc_nest.f90 similarity index 100% rename from src/DEFINE_BC/define_bc_nest.f90 rename to src/define_bc_nest.f90 diff --git a/src/DEFINE_BC/define_bc_parallipipede.f90 b/src/define_bc_parallipipede.f90 similarity index 100% rename from src/DEFINE_BC/define_bc_parallipipede.f90 rename to src/define_bc_parallipipede.f90 diff --git a/src/DEFINE_BC/define_bc_pipo.f90 b/src/define_bc_pipo.f90 similarity index 100% rename from src/DEFINE_BC/define_bc_pipo.f90 rename to src/define_bc_pipo.f90 diff --git a/src/DEFINE_BC/define_bc_riedel.f90 b/src/define_bc_riedel.f90 similarity index 100% rename from src/DEFINE_BC/define_bc_riedel.f90 rename to src/define_bc_riedel.f90 diff --git a/src/DEFINE_BC/define_bc_ritske.f90 b/src/define_bc_ritske.f90 similarity index 100% rename from src/DEFINE_BC/define_bc_ritske.f90 rename to src/define_bc_ritske.f90 diff --git a/src/DEFINE_BC/define_bc_ritske_isurf.f90 b/src/define_bc_ritske_isurf.f90 similarity index 100% rename from src/DEFINE_BC/define_bc_ritske_isurf.f90 rename to src/define_bc_ritske_isurf.f90 diff --git a/src/DEFINE_BC/define_bc_segmented_s_line.f90 b/src/define_bc_segmented_s_line.f90 similarity index 100% rename from src/DEFINE_BC/define_bc_segmented_s_line.f90 rename to src/define_bc_segmented_s_line.f90 diff --git a/src/DEFINE_BC/define_bc_sphere.f90 b/src/define_bc_sphere.f90 similarity index 100% rename from src/DEFINE_BC/define_bc_sphere.f90 rename to src/define_bc_sphere.f90 diff --git a/src/DEFINE_BC/define_bc_subduction.f90 b/src/define_bc_subduction.f90 similarity index 100% rename from src/DEFINE_BC/define_bc_subduction.f90 rename to src/define_bc_subduction.f90