Skip to content

Commit

Permalink
rename
Browse files Browse the repository at this point in the history
  • Loading branch information
@wpbonelli
wpbonelli committed Feb 19, 2024
1 parent 68f5bdf commit cc0a70f
Show file tree
Hide file tree
Showing 15 changed files with 39 additions and 45 deletions.
24 changes: 12 additions & 12 deletions make/makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,10 +109,10 @@ $(OBJDIR)/swf-cxsidm.o \
$(OBJDIR)/swf-chdidm.o \
$(OBJDIR)/simtdisidm.o \
$(OBJDIR)/sim-namidm.o \
$(OBJDIR)/prt1idm.o \
$(OBJDIR)/prt1mip1idm.o \
$(OBJDIR)/prt1disv1idm.o \
$(OBJDIR)/prt1dis1idm.o \
$(OBJDIR)/prt-namidm.o \
$(OBJDIR)/prt-mipidm.o \
$(OBJDIR)/prt-disvidm.o \
$(OBJDIR)/prt-disidm.o \
$(OBJDIR)/gwt-namidm.o \
$(OBJDIR)/gwt-icidm.o \
$(OBJDIR)/gwt-dspidm.o \
Expand Down Expand Up @@ -144,7 +144,7 @@ $(OBJDIR)/gwe-ctpidm.o \
$(OBJDIR)/gwe-cndidm.o \
$(OBJDIR)/exg-swfgwfidm.o \
$(OBJDIR)/exg-gwtgwtidm.o \
$(OBJDIR)/gwfprtidm.o \
$(OBJDIR)/exg-gwfprtidm.o \
$(OBJDIR)/exg-gwfgwtidm.o \
$(OBJDIR)/exg-gwfgwfidm.o \
$(OBJDIR)/exg-gwfgweidm.o \
Expand Down Expand Up @@ -209,7 +209,7 @@ $(OBJDIR)/FlowModelInterface.o \
$(OBJDIR)/Subcell.o \
$(OBJDIR)/TrackData.o \
$(OBJDIR)/TimeSelect.o \
$(OBJDIR)/prt1fmi1.o \
$(OBJDIR)/prt-fmi.o \
$(OBJDIR)/Cell.o \
$(OBJDIR)/sort.o \
$(OBJDIR)/SfrCrossSectionUtils.o \
Expand Down Expand Up @@ -370,10 +370,10 @@ $(OBJDIR)/swf-oc.o \
$(OBJDIR)/swf-obs.o \
$(OBJDIR)/swf-flw.o \
$(OBJDIR)/swf-dfw.o \
$(OBJDIR)/prt1prp1.o \
$(OBJDIR)/prt1oc1.o \
$(OBJDIR)/prt1obs1.o \
$(OBJDIR)/prt1mip.o \
$(OBJDIR)/prt-prp.o \
$(OBJDIR)/prt-oc.o \
$(OBJDIR)/prt-obs.o \
$(OBJDIR)/prt-mip.o \
$(OBJDIR)/MethodPool.o \
$(OBJDIR)/SpatialModelConnection.o \
$(OBJDIR)/GwtInterfaceModel.o \
Expand All @@ -389,7 +389,7 @@ $(OBJDIR)/StressListInput.o \
$(OBJDIR)/StressGridInput.o \
$(OBJDIR)/LoadMf6File.o \
$(OBJDIR)/swf.o \
$(OBJDIR)/prt1.o \
$(OBJDIR)/prt.o \
$(OBJDIR)/ExplicitSolution.o \
$(OBJDIR)/GwtGwtConnection.o \
$(OBJDIR)/GwfGwfConnection.o \
Expand All @@ -407,7 +407,7 @@ $(OBJDIR)/VirtualGweExchange.o \
$(OBJDIR)/exg-swfgwf.o \
$(OBJDIR)/SolutionGroup.o \
$(OBJDIR)/SolutionFactory.o \
$(OBJDIR)/GwfPrtExchange.o \
$(OBJDIR)/exg-gwfprt.o \
$(OBJDIR)/exg-gwfgwt.o \
$(OBJDIR)/exg-gwfgwe.o \
$(OBJDIR)/RunControl.o \
Expand Down
33 changes: 15 additions & 18 deletions msvs/mf6core.vfproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,16 +104,12 @@
<File RelativePath="..\src\Distributed\VirtualModel.f90"/>
<File RelativePath="..\src\Distributed\VirtualSolution.f90"/></Filter>
<Filter Name="Exchange">
<File RelativePath="..\src\Exchange\gwfgwfidm.f90"/>
<File RelativePath="..\src\Exchange\gwfgwtidm.f90"/>
<File RelativePath="..\src\Exchange\gwtgwtidm.f90"/>
<File RelativePath="..\src\Exchange\gwfprtidm.f90"/>
<File RelativePath="..\src\Exchange\BaseExchange.f90"/>
<File RelativePath="..\src\Exchange\DisConnExchange.f90"/>
<File RelativePath="..\src\Exchange\GhostNode.f90"/>
<File RelativePath="..\src\Exchange\GwfExchangeMover.f90"/>
<File RelativePath="..\src\Exchange\exg-gwegwe.f90"/>
<File RelativePath="..\src\Exchange\exg-gwegweidm.f90"/>
<File RelativePath="..\src\Exchange\GwfExchangeMover.f90"/>
<File RelativePath="..\src\Exchange\exg-gwfgwe.f90"/>
<File RelativePath="..\src\Exchange\exg-gwfgweidm.f90"/>
<File RelativePath="..\src\Exchange\exg-gwfgwf.f90"/>
Expand All @@ -124,8 +120,9 @@
<File RelativePath="..\src\Exchange\exg-gwtgwtidm.f90"/>
<File RelativePath="..\src\Exchange\exg-swfgwf.f90"/>
<File RelativePath="..\src\Exchange\exg-swfgwfidm.f90"/>
<File RelativePath="..\src\Exchange\exg-gwfprt.f90"/>
<File RelativePath="..\src\Exchange\exg-gwfprtidm.f90"/>
<File RelativePath="..\src\Exchange\NumericalExchange.f90"/></Filter>
<File RelativePath="..\src\Exchange\GwfPrtExchange.f90"/>
<Filter Name="Model">
<Filter Name="Connection">
<File RelativePath="..\src\Model\Connection\CellWithNbrs.f90"/>
Expand Down Expand Up @@ -246,6 +243,18 @@
<File RelativePath="..\src\Model\SurfaceWaterFlow\swf-zdg.f90"/>
<File RelativePath="..\src\Model\SurfaceWaterFlow\swf-zdgidm.f90"/>
</Filter>
<Filter Name="ParticleTracking">
<File RelativePath="..\src\Model\ParticleTracking\prt.f90"/>
<File RelativePath="..\src\Model\ParticleTracking\prt-namidm.f90"/>
<File RelativePath="..\src\Model\ParticleTracking\prt-fmi.f90"/>
<File RelativePath="..\src\Model\ParticleTracking\prt-mip.f90"/>
<File RelativePath="..\src\Model\ParticleTracking\prt-obs.f90"/>
<File RelativePath="..\src\Model\ParticleTracking\prt-oc.f90"/>
<File RelativePath="..\src\Model\ParticleTracking\prt-prp.f90"/>
<File RelativePath="..\src\Model\ParticleTracking\prt-disidm.f90"/>
<File RelativePath="..\src\Model\ParticleTracking\prt-disvidm.f90"/>
<File RelativePath="..\src\Model\ParticleTracking\prt-mipidm.f90"/>
</Filter>
<Filter Name="ModelUtilities">
<File RelativePath="..\src\Model\ModelUtilities\BoundaryPackage.f90"/>
<File RelativePath="..\src\Model\ModelUtilities\BoundaryPackageExt.f90"/>
Expand Down Expand Up @@ -289,18 +298,6 @@
<File RelativePath="..\src\Model\ExplicitModel.f90"/>
<File RelativePath="..\src\Model\NumericalModel.f90"/>
<File RelativePath="..\src\Model\NumericalPackage.f90"/></Filter>
<Filter Name="ParticleTracking">
<File RelativePath="..\src\Model\ParticleTracking\prt1.f90"/>
<File RelativePath="..\src\Model\ParticleTracking\prt1idm.f90"/>
<File RelativePath="..\src\Model\ParticleTracking\prt1fmi1.f90"/>
<File RelativePath="..\src\Model\ParticleTracking\prt1mip.f90"/>
<File RelativePath="..\src\Model\ParticleTracking\prt1obs1.f90"/>
<File RelativePath="..\src\Model\ParticleTracking\prt1oc1.f90"/>
<File RelativePath="..\src\Model\ParticleTracking\prt1prp1.f90"/>
<File RelativePath="..\src\Model\ParticleTracking\prt1dis1idm.f90"/>
<File RelativePath="..\src\Model\ParticleTracking\prt1disv1idm.f90"/>
<File RelativePath="..\src\Model\ParticleTracking\prt1mip1idm.f90"/>
</Filter>
<Filter Name="Solution">
<Filter Name="LinearMethods">
<File RelativePath="..\src\Solution\LinearMethods\ImsLinearBase.f90"/>
Expand Down
0 src/Exchange/GwfPrtExchange.f90 → src/Exchange/exg-gwfprt.f90
View file
File renamed without changes.
0 src/Exchange/gwfprtidm.f90 → src/Exchange/exg-gwfprtidm.f90
View file
File renamed without changes.
0 src/Model/ParticleTracking/prt1dis1idm.f90 → src/Model/ParticleTracking/prt-disidm.f90
View file
File renamed without changes.
0 src/Model/ParticleTracking/prt1disv1idm.f90 → src/Model/ParticleTracking/prt-disvidm.f90
View file
File renamed without changes.
0 src/Model/ParticleTracking/prt1fmi1.f90 → src/Model/ParticleTracking/prt-fmi.f90
View file
File renamed without changes.
0 src/Model/ParticleTracking/prt1mip.f90 → src/Model/ParticleTracking/prt-mip.f90
View file
File renamed without changes.
0 src/Model/ParticleTracking/prt1mip1idm.f90 → src/Model/ParticleTracking/prt-mipidm.f90
View file
File renamed without changes.
0 src/Model/ParticleTracking/prt1idm.f90 → src/Model/ParticleTracking/prt-namidm.f90
View file
File renamed without changes.
0 src/Model/ParticleTracking/prt1obs1.f90 → src/Model/ParticleTracking/prt-obs.f90
View file
File renamed without changes.
0 src/Model/ParticleTracking/prt1oc1.f90 → src/Model/ParticleTracking/prt-oc.f90
View file
File renamed without changes.
0 src/Model/ParticleTracking/prt1prp1.f90 → src/Model/ParticleTracking/prt-prp.f90
View file
File renamed without changes.
0 src/Model/ParticleTracking/prt1.f90 → src/Model/ParticleTracking/prt.f90
View file
File renamed without changes.
27 changes: 12 additions & 15 deletions src/meson.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,17 +38,14 @@ modflow_sources = files(
'Exchange' / 'exg-gwtgwt.f90',
'Exchange' / 'exg-gwegwe.f90',
'Exchange' / 'exg-swfgwf.f90',
'Exchange' / 'GwfPrtExchange.f90',
'Exchange' / 'exg-gwfprt.f90',
'Exchange' / 'exg-gwfgwfidm.f90',
'Exchange' / 'exg-gwfgwtidm.f90',
'Exchange' / 'exg-gwtgwtidm.f90',
'Exchange' / 'exg-gwfgweidm.f90',
'Exchange' / 'exg-gwegweidm.f90',
'Exchange' / 'exg-swfgwfidm.f90',
'Exchange' / 'gwfprtidm.f90',
'Exchange' / 'GwfPrtExchange.f90',
'Exchange' / 'NumericalExchange.f90',
'Exchange' / 'gwfprtidm.f90',
'Exchange' / 'exg-gwfprtidm.f90',
'Model' / 'Connection' / 'ConnectionBuilder.f90',
'Model' / 'Connection' / 'CellWithNbrs.f90',
'Model' / 'Connection' / 'CsrUtils.f90',
Expand Down Expand Up @@ -160,16 +157,16 @@ modflow_sources = files(
'Model' / 'SurfaceWaterFlow' / 'swf-sto.f90',
'Model' / 'SurfaceWaterFlow' / 'swf-zdg.f90',
'Model' / 'SurfaceWaterFlow' / 'swf-zdgidm.f90',
'Model' / 'ParticleTracking' / 'prt1.f90',
'Model' / 'ParticleTracking' / 'prt1idm.f90',
'Model' / 'ParticleTracking' / 'prt1fmi1.f90',
'Model' / 'ParticleTracking' / 'prt1mip.f90',
'Model' / 'ParticleTracking' / 'prt1obs1.f90',
'Model' / 'ParticleTracking' / 'prt1oc1.f90',
'Model' / 'ParticleTracking' / 'prt1prp1.f90',
'Model' / 'ParticleTracking' / 'prt1dis1idm.f90',
'Model' / 'ParticleTracking' / 'prt1disv1idm.f90',
'Model' / 'ParticleTracking' / 'prt1mip1idm.f90',
'Model' / 'ParticleTracking' / 'prt.f90',
'Model' / 'ParticleTracking' / 'prt-namidm.f90',
'Model' / 'ParticleTracking' / 'prt-fmi.f90',
'Model' / 'ParticleTracking' / 'prt-mip.f90',
'Model' / 'ParticleTracking' / 'prt-obs.f90',
'Model' / 'ParticleTracking' / 'prt-oc.f90',
'Model' / 'ParticleTracking' / 'prt-prp.f90',
'Model' / 'ParticleTracking' / 'prt-disidm.f90',
'Model' / 'ParticleTracking' / 'prt-disvidm.f90',
'Model' / 'ParticleTracking' / 'prt-mipidm.f90',
'Model' / 'ModelUtilities' / 'BoundaryPackage.f90',
'Model' / 'ModelUtilities' / 'BoundaryPackageExt.f90',
'Model' / 'ModelUtilities' / 'GweCndOptions.f90',
Expand Down

0 comments on commit cc0a70f

Please sign in to comment.