Skip to content

Commit eb5f11c

Browse files
committed
fix filename allocate/init in swfgwf exg, rebuild makefiles
1 parent b275b24 commit eb5f11c

File tree

2 files changed

+52
-47
lines changed

2 files changed

+52
-47
lines changed

make/makefile

Lines changed: 51 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,6 @@ $(OBJDIR)/gwf-lak.o \
245245
$(OBJDIR)/GwfVscInputData.o \
246246
$(OBJDIR)/gwf-ghb.o \
247247
$(OBJDIR)/gwf-drn.o \
248-
$(OBJDIR)/IndexMap.o \
249248
$(OBJDIR)/MethodSubcellPool.o \
250249
$(OBJDIR)/CellPoly.o \
251250
$(OBJDIR)/CellRectQuad.o \
@@ -264,11 +263,7 @@ $(OBJDIR)/gwf-tvk.o \
264263
$(OBJDIR)/HGeoUtil.o \
265264
$(OBJDIR)/gwf-vsc.o \
266265
$(OBJDIR)/GwfNpfOptions.o \
267-
$(OBJDIR)/InterfaceMap.o \
268-
$(OBJDIR)/SeqVector.o \
269-
$(OBJDIR)/ImsLinearSettings.o \
270-
$(OBJDIR)/ConvergenceSummary.o \
271-
$(OBJDIR)/ArrayReaderBase.o \
266+
$(OBJDIR)/IndexMap.o \
272267
$(OBJDIR)/MethodCellTernary.o \
273268
$(OBJDIR)/MethodCellPollockQuad.o \
274269
$(OBJDIR)/MethodCellPollock.o \
@@ -295,13 +290,11 @@ $(OBJDIR)/ImsLinearMisc.o \
295290
$(OBJDIR)/gwf-npf.o \
296291
$(OBJDIR)/GwfBuyInputData.o \
297292
$(OBJDIR)/GweCndOptions.o \
298-
$(OBJDIR)/VirtualSolution.o \
299-
$(OBJDIR)/SparseMatrix.o \
300-
$(OBJDIR)/LinearSolverBase.o \
301-
$(OBJDIR)/ImsReordering.o \
302-
$(OBJDIR)/ModflowInput.o \
303-
$(OBJDIR)/IdmLogger.o \
304-
$(OBJDIR)/Integer2dReader.o \
293+
$(OBJDIR)/InterfaceMap.o \
294+
$(OBJDIR)/SeqVector.o \
295+
$(OBJDIR)/ImsLinearSettings.o \
296+
$(OBJDIR)/ConvergenceSummary.o \
297+
$(OBJDIR)/ArrayReaderBase.o \
305298
$(OBJDIR)/DislGeom.o \
306299
$(OBJDIR)/SwfCxsUtils.o \
307300
$(OBJDIR)/MethodCellPool.o \
@@ -340,15 +333,13 @@ $(OBJDIR)/gwe-est.o \
340333
$(OBJDIR)/gwe-esl.o \
341334
$(OBJDIR)/gwe-ctp.o \
342335
$(OBJDIR)/gwe-cnd.o \
343-
$(OBJDIR)/RouterBase.o \
344-
$(OBJDIR)/ImsLinearSolver.o \
345-
$(OBJDIR)/ImsLinearBase.o \
346-
$(OBJDIR)/StructVector.o \
347-
$(OBJDIR)/DefinitionSelect.o \
348-
$(OBJDIR)/InputLoadType.o \
349-
$(OBJDIR)/Integer1dReader.o \
350-
$(OBJDIR)/Double2dReader.o \
351-
$(OBJDIR)/Double1dReader.o \
336+
$(OBJDIR)/VirtualSolution.o \
337+
$(OBJDIR)/SparseMatrix.o \
338+
$(OBJDIR)/LinearSolverBase.o \
339+
$(OBJDIR)/ImsReordering.o \
340+
$(OBJDIR)/ModflowInput.o \
341+
$(OBJDIR)/IdmLogger.o \
342+
$(OBJDIR)/Integer2dReader.o \
352343
$(OBJDIR)/swf-disl.o \
353344
$(OBJDIR)/swf-cxs.o \
354345
$(OBJDIR)/swf-ic.o \
@@ -360,15 +351,15 @@ $(OBJDIR)/gwt.o \
360351
$(OBJDIR)/gwf.o \
361352
$(OBJDIR)/GwfExchangeMover.o \
362353
$(OBJDIR)/gwe.o \
363-
$(OBJDIR)/SerialRouter.o \
364-
$(OBJDIR)/Timer.o \
365-
$(OBJDIR)/LinearSolverFactory.o \
366-
$(OBJDIR)/ImsLinear.o \
367-
$(OBJDIR)/BaseSolution.o \
368-
$(OBJDIR)/StructArray.o \
369-
$(OBJDIR)/BoundInputContext.o \
370-
$(OBJDIR)/AsciiInputLoadType.o \
371-
$(OBJDIR)/LayeredArrayReader.o \
354+
$(OBJDIR)/RouterBase.o \
355+
$(OBJDIR)/ImsLinearSolver.o \
356+
$(OBJDIR)/ImsLinearBase.o \
357+
$(OBJDIR)/StructVector.o \
358+
$(OBJDIR)/DefinitionSelect.o \
359+
$(OBJDIR)/InputLoadType.o \
360+
$(OBJDIR)/Integer1dReader.o \
361+
$(OBJDIR)/Double2dReader.o \
362+
$(OBJDIR)/Double1dReader.o \
372363
$(OBJDIR)/swf-zdg.o \
373364
$(OBJDIR)/swf-sto.o \
374365
$(OBJDIR)/swf-oc.o \
@@ -387,34 +378,47 @@ $(OBJDIR)/GwfInterfaceModel.o \
387378
$(OBJDIR)/exg-gwfgwf.o \
388379
$(OBJDIR)/GweInterfaceModel.o \
389380
$(OBJDIR)/exg-gwegwe.o \
381+
$(OBJDIR)/SerialRouter.o \
382+
$(OBJDIR)/Timer.o \
383+
$(OBJDIR)/LinearSolverFactory.o \
384+
$(OBJDIR)/ImsLinear.o \
385+
$(OBJDIR)/BaseSolution.o \
386+
$(OBJDIR)/StructArray.o \
387+
$(OBJDIR)/BoundInputContext.o \
388+
$(OBJDIR)/AsciiInputLoadType.o \
389+
$(OBJDIR)/LayeredArrayReader.o \
390+
$(OBJDIR)/swf.o \
391+
$(OBJDIR)/prt.o \
392+
$(OBJDIR)/GwtGwtConnection.o \
393+
$(OBJDIR)/GwfGwfConnection.o \
394+
$(OBJDIR)/GweGweConnection.o \
390395
$(OBJDIR)/RouterFactory.o \
391396
$(OBJDIR)/NumericalSolution.o \
392397
$(OBJDIR)/MappedMemory.o \
393398
$(OBJDIR)/StressListInput.o \
394399
$(OBJDIR)/StressGridInput.o \
395400
$(OBJDIR)/LoadMf6File.o \
396-
$(OBJDIR)/swf.o \
397-
$(OBJDIR)/prt.o \
398401
$(OBJDIR)/ExplicitSolution.o \
399-
$(OBJDIR)/GwtGwtConnection.o \
400-
$(OBJDIR)/GwfGwfConnection.o \
401-
$(OBJDIR)/GweGweConnection.o \
402-
$(OBJDIR)/VirtualDataManager.o \
403-
$(OBJDIR)/Mapper.o \
404-
$(OBJDIR)/IdmMf6File.o \
405-
$(OBJDIR)/ModelPackageInput.o \
402+
$(OBJDIR)/VirtualSwfModel.o \
403+
$(OBJDIR)/VirtualPrtModel.o \
406404
$(OBJDIR)/VirtualGwtModel.o \
407-
$(OBJDIR)/VirtualGwtExchange.o \
408405
$(OBJDIR)/VirtualGwfModel.o \
409-
$(OBJDIR)/VirtualGwfExchange.o \
410406
$(OBJDIR)/VirtualGweModel.o \
407+
$(OBJDIR)/VirtualGwtExchange.o \
408+
$(OBJDIR)/VirtualGwfExchange.o \
411409
$(OBJDIR)/VirtualGweExchange.o \
412410
$(OBJDIR)/exg-swfgwf.o \
413-
$(OBJDIR)/SolutionGroup.o \
414-
$(OBJDIR)/SolutionFactory.o \
415411
$(OBJDIR)/exg-gwfprt.o \
416412
$(OBJDIR)/exg-gwfgwt.o \
417413
$(OBJDIR)/exg-gwfgwe.o \
414+
$(OBJDIR)/VirtualDataManager.o \
415+
$(OBJDIR)/Mapper.o \
416+
$(OBJDIR)/IdmMf6File.o \
417+
$(OBJDIR)/ModelPackageInput.o \
418+
$(OBJDIR)/SolutionGroup.o \
419+
$(OBJDIR)/SolutionFactory.o \
420+
$(OBJDIR)/ModelFactory.o \
421+
$(OBJDIR)/ExchangeFactory.o \
418422
$(OBJDIR)/RunControl.o \
419423
$(OBJDIR)/SourceLoad.o \
420424
$(OBJDIR)/ModelPackageInputs.o \
@@ -435,7 +439,9 @@ $(OBJDIR)/blas1_d.o \
435439
$(OBJDIR)/Iunit.o \
436440
$(OBJDIR)/RectangularGeometry.o \
437441
$(OBJDIR)/CircularGeometry.o \
438-
$(OBJDIR)/ExplicitModel.o
442+
$(OBJDIR)/ExplicitModel.o \
443+
$(OBJDIR)/VirtualSwfExchange.o \
444+
$(OBJDIR)/VirtualPrtExchange.o
439445

440446
# Define the objects that make up the program
441447
$(PROGRAM) : $(OBJECTS)

src/Exchange/exg-swfgwf.f90

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -377,6 +377,7 @@ subroutine allocate_scalars(this)
377377
call mem_allocate(this%nexg, 'NEXG', this%memoryPath)
378378
call mem_allocate(this%inobs, 'INOBS', this%memoryPath)
379379
!
380+
this%filename = ''
380381
this%ipr_input = 0
381382
this%ipr_flow = 0
382383
this%nexg = 0
@@ -393,8 +394,6 @@ subroutine allocate_arrays(this)
393394
! -- dummy
394395
class(SwfGwfExchangeType) :: this !< instance of exchange object
395396
!
396-
allocate (this%filename)
397-
this%filename = ''
398397
call mem_allocate(this%nodem1, this%nexg, 'NODEM1', this%memoryPath)
399398
call mem_allocate(this%nodem2, this%nexg, 'NODEM2', this%memoryPath)
400399
call mem_allocate(this%cond, this%nexg, 'COND', this%memoryPath)

0 commit comments

Comments
 (0)