JGonzalez/fpakc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Almost compiling. Issue was in generating objects for submodules

Browse source
This commit is contained in:
Jorge Gonzalez 2026-02-24 20:18:06 +01:00
commit 6b4d4fbcc3
3 changed files with 9 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/makefile
View file

@ -1,4 +1,5 @@
OBJECTS = $(OBJDIR)/moduleMesh.o $(OBJDIR)/moduleMeshCommon.o $(OBJDIR)/moduleCompTime.o \
$(OBJDIR)/moduleMesh@elements.o $(OBJDIR)/moduleMesh@boundaryEM.o $(OBJDIR)/moduleMesh@boundaryParticle.o $(OBJDIR)/moduleMesh@surfaces.o \
$(OBJDIR)/moduleSpecies.o $(OBJDIR)/moduleInject.o $(OBJDIR)/moduleInput.o \
$(OBJDIR)/moduleErrors.o $(OBJDIR)/moduleList.o $(OBJDIR)/moduleOutput.o \
$(OBJDIR)/moduleCaseParam.o $(OBJDIR)/moduleRefParam.o \

8
src/modules/mesh/makefile
View file

@ -20,10 +20,10 @@ all: moduleMesh.o inout.o 3DCart.o 2DCyl.o 2DCart.o 1DRad.o 1DCart.o 0D.o
moduleMesh.o: moduleMeshCommon.o moduleMesh.f90
$(FC) $(FCFLAGS) -c $(subst .o,.f90,$@) -o $(OBJDIR)/$@
$(FC) $(FCFLAGS) -c moduleMesh@elements.f90 -o $(OBJDIR)/$@
$(FC) $(FCFLAGS) -c moduleMesh@boundaryParticle.f90 -o $(OBJDIR)/$@
$(FC) $(FCFLAGS) -c moduleMesh@boundaryEM.f90 -o $(OBJDIR)/$@
$(FC) $(FCFLAGS) -c moduleMesh@surfaces.f90 -o $(OBJDIR)/$@
$(FC) $(FCFLAGS) -c moduleMesh@elements.f90 -o $(OBJDIR)/moduleMesh@elements.o
$(FC) $(FCFLAGS) -c moduleMesh@boundaryParticle.f90 -o $(OBJDIR)/moduleMesh@boundaryParticle.o
$(FC) $(FCFLAGS) -c moduleMesh@boundaryEM.f90 -o $(OBJDIR)/moduleMesh@boundaryEM.o
$(FC) $(FCFLAGS) -c moduleMesh@surfaces.f90 -o $(OBJDIR)/moduleMesh@surfaces.o
inout.o: 3DCart.o 2DCyl.o 2DCart.o 1DRad.o 1DCart.o 0D.o
$(MAKE) -C inout all

15
src/modules/mesh/moduleMesh.f90
View file

@ -11,7 +11,6 @@ MODULE moduleMesh
TYPE, PUBLIC, ABSTRACT:: meshElement
!Index
INTEGER:: n = 0
CONTAINS
END TYPE meshElement
@ -523,9 +522,9 @@ MODULE moduleMesh
PROCEDURE(printEM_interface), POINTER, PASS:: printEM => NULL()
PROCEDURE(printAverage_interface), POINTER, PASS:: printAverage => NULL()
CONTAINS
!GENERIC PROCEDURES
PROCEDURE, PASS:: constructGlobalK
PROCEDURE, PASS:: doCoulomb
!GENERIC PROCEDURES
PROCEDURE, PASS:: constructGlobalK
PROCEDURE, PASS:: doCoulomb
END TYPE meshParticles
@ -571,8 +570,6 @@ MODULE moduleMesh
!Collision (MCC) mesh
TYPE, EXTENDS(meshGeneric):: meshCollisions
CONTAINS
!GENERIC PROCEDURES
END TYPE meshCollisions
@ -836,13 +833,11 @@ MODULE moduleMesh
TYPE:: boundaryParticleCont
CLASS(boundaryParticleGeneric), ALLOCATABLE:: obj
CONTAINS
END TYPE boundaryParticleCont
type:: boundaryParticlePointer
class(boundaryParticleGeneric), pointer:: obj
contains
end type boundaryParticlePointer
@ -861,7 +856,7 @@ MODULE moduleMesh
procedure(updateEM_interface), pointer, pass:: update => null()
contains
procedure, pass:: init => initBoundaryEM
procedure, pass:: init => initBoundaryEM
procedure(applyEM_interface), deferred, pass:: apply
end type boundaryEMGeneric
@ -908,7 +903,6 @@ MODULE moduleMesh
! Extended types
TYPE, EXTENDS(boundaryEMGeneric):: boundaryEMDirichlet
REAL(8):: potential
CONTAINS
! boundaryEMGeneric DEFERRED PROCEDURES
PROCEDURE, PASS:: apply => applyDirichlet
@ -918,7 +912,6 @@ MODULE moduleMesh
TYPE, EXTENDS(boundaryEMGeneric):: boundaryEMDirichletTime
real(8):: potential
type(table1D):: temporalProfile
contains
! boundaryEMGeneric DEFERRED PROCEDURES
procedure, pass:: apply => applyDirichletTime