From 7e4f200bd627af8fe7572efec99c57f26eedf3df Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Thu, 4 Aug 2016 16:57:56 +0200 Subject: [PATCH] GIT: rearrange files for lib-conversion - re-group according to file-format instead of reader/writer --- src/conversion/Make/files | 22 +++++++++---------- .../{meshReader => common/reader}/README | 0 .../reader}/calcPointCells.C | 0 .../reader}/createPolyBoundary.C | 0 .../reader}/createPolyCells.C | 0 .../reader}/meshReader.C | 0 .../reader}/meshReader.H | 0 .../reader}/meshReaderAux.C | 0 .../{meshTables => common/tables}/README | 0 .../tables}/boundaryRegion.C | 0 .../tables}/boundaryRegion.H | 0 .../{meshTables => common/tables}/cellTable.C | 0 .../{meshTables => common/tables}/cellTable.H | 0 .../tables}/remappingDict | 0 .../writer}/meshWriter.C | 0 .../writer}/meshWriter.H | 0 .../starcd/STARCDMeshReader.C | 0 .../starcd/STARCDMeshReader.H | 0 .../starcd/STARCDMeshWriter.C | 0 .../starcd/STARCDMeshWriter.H | 0 20 files changed, 11 insertions(+), 11 deletions(-) rename src/conversion/{meshReader => common/reader}/README (100%) rename src/conversion/{meshReader => common/reader}/calcPointCells.C (100%) rename src/conversion/{meshReader => common/reader}/createPolyBoundary.C (100%) rename src/conversion/{meshReader => common/reader}/createPolyCells.C (100%) rename src/conversion/{meshReader => common/reader}/meshReader.C (100%) rename src/conversion/{meshReader => common/reader}/meshReader.H (100%) rename src/conversion/{meshReader => common/reader}/meshReaderAux.C (100%) rename src/conversion/{meshTables => common/tables}/README (100%) rename src/conversion/{meshTables => common/tables}/boundaryRegion.C (100%) rename src/conversion/{meshTables => common/tables}/boundaryRegion.H (100%) rename src/conversion/{meshTables => common/tables}/cellTable.C (100%) rename src/conversion/{meshTables => common/tables}/cellTable.H (100%) rename src/conversion/{meshTables => common/tables}/remappingDict (100%) rename src/conversion/{meshWriter => common/writer}/meshWriter.C (100%) rename src/conversion/{meshWriter => common/writer}/meshWriter.H (100%) rename src/conversion/{meshReader => }/starcd/STARCDMeshReader.C (100%) rename src/conversion/{meshReader => }/starcd/STARCDMeshReader.H (100%) rename src/conversion/{meshWriter => }/starcd/STARCDMeshWriter.C (100%) rename src/conversion/{meshWriter => }/starcd/STARCDMeshWriter.H (100%) diff --git a/src/conversion/Make/files b/src/conversion/Make/files index b4a38476a1..bbf86cf859 100644 --- a/src/conversion/Make/files +++ b/src/conversion/Make/files @@ -1,3 +1,12 @@ +common/reader/meshReader.C +common/reader/meshReaderAux.C +common/reader/calcPointCells.C +common/reader/createPolyCells.C +common/reader/createPolyBoundary.C +common/writer/meshWriter.C +common/tables/boundaryRegion.C +common/tables/cellTable.C + ensight/file/ensightFile.C ensight/file/ensightGeoFile.C ensight/readFile/ensightReadFile.C @@ -7,18 +16,9 @@ ensight/part/ensightPartCells.C ensight/part/ensightPartFaces.C ensight/part/ensightParts.C -meshTables/boundaryRegion.C -meshTables/cellTable.C -meshReader/meshReader.C -meshReader/meshReaderAux.C -meshReader/calcPointCells.C -meshReader/createPolyCells.C -meshReader/createPolyBoundary.C -meshReader/starcd/STARCDMeshReader.C - -meshWriter/meshWriter.C -meshWriter/starcd/STARCDMeshWriter.C +starcd/STARCDMeshReader.C +starcd/STARCDMeshWriter.C polyDualMesh/polyDualMesh.C diff --git a/src/conversion/meshReader/README b/src/conversion/common/reader/README similarity index 100% rename from src/conversion/meshReader/README rename to src/conversion/common/reader/README diff --git a/src/conversion/meshReader/calcPointCells.C b/src/conversion/common/reader/calcPointCells.C similarity index 100% rename from src/conversion/meshReader/calcPointCells.C rename to src/conversion/common/reader/calcPointCells.C diff --git a/src/conversion/meshReader/createPolyBoundary.C b/src/conversion/common/reader/createPolyBoundary.C similarity index 100% rename from src/conversion/meshReader/createPolyBoundary.C rename to src/conversion/common/reader/createPolyBoundary.C diff --git a/src/conversion/meshReader/createPolyCells.C b/src/conversion/common/reader/createPolyCells.C similarity index 100% rename from src/conversion/meshReader/createPolyCells.C rename to src/conversion/common/reader/createPolyCells.C diff --git a/src/conversion/meshReader/meshReader.C b/src/conversion/common/reader/meshReader.C similarity index 100% rename from src/conversion/meshReader/meshReader.C rename to src/conversion/common/reader/meshReader.C diff --git a/src/conversion/meshReader/meshReader.H b/src/conversion/common/reader/meshReader.H similarity index 100% rename from src/conversion/meshReader/meshReader.H rename to src/conversion/common/reader/meshReader.H diff --git a/src/conversion/meshReader/meshReaderAux.C b/src/conversion/common/reader/meshReaderAux.C similarity index 100% rename from src/conversion/meshReader/meshReaderAux.C rename to src/conversion/common/reader/meshReaderAux.C diff --git a/src/conversion/meshTables/README b/src/conversion/common/tables/README similarity index 100% rename from src/conversion/meshTables/README rename to src/conversion/common/tables/README diff --git a/src/conversion/meshTables/boundaryRegion.C b/src/conversion/common/tables/boundaryRegion.C similarity index 100% rename from src/conversion/meshTables/boundaryRegion.C rename to src/conversion/common/tables/boundaryRegion.C diff --git a/src/conversion/meshTables/boundaryRegion.H b/src/conversion/common/tables/boundaryRegion.H similarity index 100% rename from src/conversion/meshTables/boundaryRegion.H rename to src/conversion/common/tables/boundaryRegion.H diff --git a/src/conversion/meshTables/cellTable.C b/src/conversion/common/tables/cellTable.C similarity index 100% rename from src/conversion/meshTables/cellTable.C rename to src/conversion/common/tables/cellTable.C diff --git a/src/conversion/meshTables/cellTable.H b/src/conversion/common/tables/cellTable.H similarity index 100% rename from src/conversion/meshTables/cellTable.H rename to src/conversion/common/tables/cellTable.H diff --git a/src/conversion/meshTables/remappingDict b/src/conversion/common/tables/remappingDict similarity index 100% rename from src/conversion/meshTables/remappingDict rename to src/conversion/common/tables/remappingDict diff --git a/src/conversion/meshWriter/meshWriter.C b/src/conversion/common/writer/meshWriter.C similarity index 100% rename from src/conversion/meshWriter/meshWriter.C rename to src/conversion/common/writer/meshWriter.C diff --git a/src/conversion/meshWriter/meshWriter.H b/src/conversion/common/writer/meshWriter.H similarity index 100% rename from src/conversion/meshWriter/meshWriter.H rename to src/conversion/common/writer/meshWriter.H diff --git a/src/conversion/meshReader/starcd/STARCDMeshReader.C b/src/conversion/starcd/STARCDMeshReader.C similarity index 100% rename from src/conversion/meshReader/starcd/STARCDMeshReader.C rename to src/conversion/starcd/STARCDMeshReader.C diff --git a/src/conversion/meshReader/starcd/STARCDMeshReader.H b/src/conversion/starcd/STARCDMeshReader.H similarity index 100% rename from src/conversion/meshReader/starcd/STARCDMeshReader.H rename to src/conversion/starcd/STARCDMeshReader.H diff --git a/src/conversion/meshWriter/starcd/STARCDMeshWriter.C b/src/conversion/starcd/STARCDMeshWriter.C similarity index 100% rename from src/conversion/meshWriter/starcd/STARCDMeshWriter.C rename to src/conversion/starcd/STARCDMeshWriter.C diff --git a/src/conversion/meshWriter/starcd/STARCDMeshWriter.H b/src/conversion/starcd/STARCDMeshWriter.H similarity index 100% rename from src/conversion/meshWriter/starcd/STARCDMeshWriter.H rename to src/conversion/starcd/STARCDMeshWriter.H