From 6b4d4fbcc321e7a2ec3a34cc790702f790ac5108 Mon Sep 17 00:00:00 2001 From: JGonzalez Date: Tue, 24 Feb 2026 20:18:06 +0100 Subject: [PATCH] Almost compiling. Issue was in generating objects for submodules --- src/makefile | 1 + src/modules/mesh/makefile | 8 ++++---- src/modules/mesh/moduleMesh.f90 | 15 ++++----------- 3 files changed, 9 insertions(+), 15 deletions(-) diff --git a/src/makefile b/src/makefile index 3f142e3..e422355 100644 --- a/src/makefile +++ b/src/makefile @@ -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 \ diff --git a/src/modules/mesh/makefile b/src/modules/mesh/makefile index 7ae8abb..5199a11 100644 --- a/src/modules/mesh/makefile +++ b/src/modules/mesh/makefile @@ -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 diff --git a/src/modules/mesh/moduleMesh.f90 b/src/modules/mesh/moduleMesh.f90 index 2e9afc0..d7e5eff 100644 --- a/src/modules/mesh/moduleMesh.f90 +++ b/src/modules/mesh/moduleMesh.f90 @@ -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