Skip to content

Addition of scalar point source and its inclusion into a new solver #660

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
uttamcadambi07 wants to merge 13 commits into
base: main
Choose a base branch
from
Open

Addition of scalar point source and its inclusion into a new solver #660

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
3b2292e
Passive scalar source added for a box without Gaussian smoothing
uttamcadambi07 Jul 3, 2024
d30c683
New solver with fTSource added
uttamcadambi07 Jul 3, 2024
cb02afd
Residual classes updated
uttamcadambi07 Jul 3, 2024
51d5c1c
aded the new solver DAMySimpleTFoam
uttamcadambi07 Jul 3, 2024
528156a
changed existing solver
uttamcadambi07 Jul 8, 2024
b252282
please check the hasFvSource_ code here
uttamcadambi07 Jul 8, 2024
6427519
updated Make/files with DAFvSourceScalar
uttamcadambi07 Jul 8, 2024
307d904
added a test case to check implementation
uttamcadambi07 Jul 8, 2024
026825e
deleted the MySimpleTFoam and related files
uttamcadambi07 Jul 18, 2024
ecf9118
changed the pyDAFoam.py file to discard DAMySimpleTFoam
uttamcadambi07 Jul 18, 2024
ea82e80
removed the test case from here
uttamcadambi07 Jul 18, 2024
d8d14d7
adding the SA model without fv3
uttamcadambi07 Jul 18, 2024
99adb9d
All changes for patch design variable except parallel handling and mu…
uttamcadambi07 Nov 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,17 @@

# PyCharm specific
/.idea

# Build artifacts
build/
*.so
*.egg-info/
__pycache__/

# OpenFOAM specific symlinks and makes
src/adjoint/lnInclude/
src/adjoint/Make/linux64GccDPInt32Opt/

# Temporary files
status
run.sh
161 changes: 26 additions & 135 deletions dafoam/mphys/mphys_dafoam.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -657,20 +657,10 @@ def setup(self):
if "comps" in list(designVariables[dvName].keys()):
nACTDVars = len(designVariables[dvName]["comps"])
self.add_input(dvName, distributed=False, shape=nACTDVars, tags=["mphys_coupling"])
elif dvType == "HSC": # add heat source parameter variables
nHSCVars = 9
if "comps" in list(designVariables[dvName].keys()):
nHSCVars = len(designVariables[dvName]["comps"])
self.add_input(dvName, distributed=False, shape=nHSCVars, tags=["mphys_coupling"])
elif dvType == "Field": # add field variables
# user can prescribe whether the field var is distributed. Default is True
distributed = True
if "distributed" in designVariables[dvName]:
distributed = designVariables[dvName]["distributed"]
self.add_input(dvName, distributed=distributed, shape_by_conn=True, tags=["mphys_coupling"])
self.add_input(dvName, distributed=True, shape_by_conn=True, tags=["mphys_coupling"])
elif dvType == "RegPar":
modelName = designVariables[dvName]["modelName"]
nParameters = self.DASolver.solver.getNRegressionParameters(modelName.encode())
nParameters = self.DASolver.solver.getNRegressionParameters()
self.add_input(dvName, distributed=False, shape=nParameters, tags=["mphys_coupling"])
else:
raise AnalysisError("designVarType %s not supported! " % dvType)
Expand Down Expand Up @@ -707,12 +697,7 @@ def apply_options(self, optionDict):
# calculate the residual
def apply_nonlinear(self, inputs, outputs, residuals):
DASolver = self.DASolver
# NOTE: we do not pass the states from inputs to the OF layer.
# this can cause potential convergence issue because the initial states
# in the inputs are set to all ones. So passing this all-ones states
# into the OF layer may diverge the primal solver. Here we can always
# use the states from the OF layer to compute the residuals.
# DASolver.setStates(outputs["%s_states" % self.discipline])
DASolver.setStates(outputs["%s_states" % self.discipline])

# get flow residuals from DASolver
residuals["%s_states" % self.discipline] = DASolver.getResiduals()
Expand Down Expand Up @@ -893,26 +878,6 @@ def apply_linear(self, inputs, outputs, d_inputs, d_outputs, d_residuals, mode):
d_inputs[inputName] += ACTDBarSub
else:
d_inputs[inputName] += ACTDBar

# compute [dRdHSC]^T*Psi using reverse mode AD
elif self.dvType[inputName] == "HSC":
prodVec = PETSc.Vec().create(self.comm)
prodVec.setSizes((PETSc.DECIDE, 9), bsize=1)
prodVec.setFromOptions()
DASolver.solverAD.calcdRdHSCTPsiAD(
DASolver.xvVec, DASolver.wVec, resBarVec, inputName.encode(), prodVec
)
# we will convert the MPI prodVec to seq array for all procs
HSCBar = DASolver.convertMPIVec2SeqArray(prodVec)
if "comps" in list(designVariables[inputName].keys()):
nHSCVars = len(designVariables[inputName]["comps"])
HSCBarSub = np.zeros(nHSCVars, "d")
for i in range(nHSCVars):
comp = designVariables[inputName]["comps"][i]
HSCBarSub[i] = HSCBar[comp]
d_inputs[inputName] += HSCBarSub
else:
d_inputs[inputName] += HSCBar

# compute dRdFieldT*Psi using reverse mode AD
elif self.dvType[inputName] == "Field":
Expand All @@ -928,15 +893,7 @@ def apply_linear(self, inputs, outputs, d_inputs, d_outputs, d_residuals, mode):
DASolver.solverAD.calcdRdFieldTPsiAD(
DASolver.xvVec, DASolver.wVec, resBarVec, inputName.encode(), prodVec
)
# user can prescribe whether the field var is distributed. Default is True
distributed = True
if "distributed" in designVariables[inputName]:
distributed = designVariables[inputName]["distributed"]

if distributed:
fieldBar = DASolver.vec2Array(prodVec)
else:
fieldBar = DASolver.convertMPIVec2SeqArray(prodVec)
fieldBar = DASolver.vec2Array(prodVec)
d_inputs[inputName] += fieldBar

elif self.dvType[inputName] == "RegPar":
Expand All @@ -946,11 +903,7 @@ def apply_linear(self, inputs, outputs, d_inputs, d_outputs, d_residuals, mode):
product = np.zeros_like(parameters)
seeds = d_residuals["%s_states" % self.discipline]

modelName = designVariables[inputName]["modelName"]

DASolver.solverAD.calcdRdRegParTPsiAD(
volCoords, states, parameters, seeds, modelName.encode(), product
)
DASolver.solverAD.calcdRdRegParTPsiAD(volCoords, states, parameters, seeds, product)

# reduce to make sure all procs get the same product
product = self.comm.allreduce(product, op=MPI.SUM)
Expand Down Expand Up @@ -1009,27 +962,27 @@ def solve_linear(self, d_outputs, d_residuals, mode):
# to check if a recompute is needed. In other words, we only recompute the PC for the first obj func
# adjoint solution

if DASolver.getOption("writeDeformedFFDs"):
if self.DVGeo is None:
raise RuntimeError(
"writeDeformedFFDs is set but no DVGeo object found! Please call add_dvgeo in the run script!"
)
else:
self.DVGeo.writeTecplot("deformedFFDs_%d.dat" % self.solution_counter)

if DASolver.getOption("writeDeformedConstraints"):
if self.DVCon is None:
raise RuntimeError(
"writeDeformedConstraints is set but no DVCon object found! Please call add_dvcon in the run script!"
)
else:
self.DVCon.writeTecplot("deformedConstraints_%d.dat" % self.solution_counter)

solutionTime, renamed = DASolver.renameSolution(self.solution_counter)

if renamed:
# write the deformed FFD for post-processing
if DASolver.getOption("writeDeformedFFDs"):
if self.DVGeo is None:
raise RuntimeError(
"writeDeformedFFDs is set but no DVGeo object found! Please call add_dvgeo in the run script!"
)
else:
self.DVGeo.writeTecplot("deformedFFDs_%d.dat" % self.solution_counter)

# write the deformed constraints for post-processing
if DASolver.getOption("writeDeformedConstraints"):
if self.DVCon is None:
raise RuntimeError(
"writeDeformedConstraints is set but no DVCon object found! Please call add_dvcon in the run script!"
)
else:
self.DVCon.writeTecplot("deformedConstraints_%d.dat" % self.solution_counter)

# DASolver.writeDeformedFFDs(self.solution_counter)
# print the solution counter
if self.comm.rank == 0:
print("Driver total derivatives for iteration: %d" % self.solution_counter)
Expand Down Expand Up @@ -1057,9 +1010,6 @@ def solve_linear(self, d_outputs, d_residuals, mode):
# in the next line
if not self.DASolver.getOption("adjEqnOption")["useNonZeroInitGuess"]:
self.psi.set(0)
else:
# if useNonZeroInitGuess is True, we will assign the OM's psi to self.psi
self.psi = DASolver.array2Vec(d_residuals["%s_states" % self.discipline].copy())

if self.DASolver.getOption("adjEqnOption")["dynAdjustTol"]:
# if we want to dynamically adjust the tolerance, call this function. This is mostly used
Expand All @@ -1069,13 +1019,6 @@ def solve_linear(self, d_outputs, d_residuals, mode):

# actually solving the adjoint linear equation using Petsc
fail = DASolver.solverAD.solveLinearEqn(DASolver.ksp, dFdW, self.psi)

# optionally write the adjoint vector as OpenFOAM field format for post-processing
# update the obj func name for solve_linear later
solveLinearObjFuncName = DASolver.getOption("solveLinearObjFuncName")
psi_array = DASolver.vec2Array(self.psi)
self.DASolver.writeAdjointFields(solveLinearObjFuncName, float(solutionTime), psi_array)

elif adjEqnSolMethod == "fixedPoint":
solutionTime, renamed = DASolver.renameSolution(self.solution_counter)
if renamed:
Expand Down Expand Up @@ -1276,20 +1219,10 @@ def setup(self):
if "comps" in list(designVariables[dvName].keys()):
nACTDVars = len(designVariables[dvName]["comps"])
self.add_input(dvName, distributed=False, shape=nACTDVars, tags=["mphys_coupling"])
elif dvType == "HSC": # add heat source parameter variables
nHSCVars = 9
if "comps" in list(designVariables[dvName].keys()):
nHSCVars = len(designVariables[dvName]["comps"])
self.add_input(dvName, distributed=False, shape=nHSCVars, tags=["mphys_coupling"])
elif dvType == "Field": # add field variables
# user can prescribe whether the field var is distributed. Default is True
distributed = True
if "distributed" in designVariables[dvName]:
distributed = designVariables[dvName]["distributed"]
self.add_input(dvName, distributed=distributed, shape_by_conn=True, tags=["mphys_coupling"])
self.add_input(dvName, distributed=True, shape_by_conn=True, tags=["mphys_coupling"])
elif dvType == "RegPar":
modelName = designVariables[dvName]["modelName"]
nParameters = self.DASolver.solver.getNRegressionParameters(modelName.encode())
nParameters = self.DASolver.solver.getNRegressionParameters()
self.add_input(dvName, distributed=False, shape=nParameters, tags=["mphys_coupling"])
else:
raise AnalysisError("designVarType %s not supported! " % dvType)
Expand Down Expand Up @@ -1393,10 +1326,6 @@ def compute_jacvec_product(self, inputs, d_inputs, d_outputs, mode):

if self.comm.rank == 0:
print("Computing partials for ", list(funcsBar.keys()))

# update the obj func name for solve_linear later
DASolver.setOption("solveLinearObjFuncName", list(funcsBar.keys())[0])
DASolver.updateDAOption()

# loop over all d_inputs keys and compute the partials accordingly
for objFuncName in list(funcsBar.keys()):
Expand Down Expand Up @@ -1477,26 +1406,6 @@ def compute_jacvec_product(self, inputs, d_inputs, d_outputs, mode):
d_inputs[inputName] += ACTDBarSub * fBar
else:
d_inputs[inputName] += ACTDBar * fBar

# compute dFdHSC
elif self.dvType[inputName] == "HSC":
dFdHSC = PETSc.Vec().create(self.comm)
dFdHSC.setSizes((PETSc.DECIDE, 9), bsize=1)
dFdHSC.setFromOptions()
DASolver.solverAD.calcdFdHSCAD(
DASolver.xvVec, DASolver.wVec, objFuncName.encode(), inputName.encode(), dFdHSC
)
# we will convert the MPI dFdHSC to seq array for all procs
HSCBar = DASolver.convertMPIVec2SeqArray(dFdHSC)
if "comps" in list(designVariables[inputName].keys()):
nHSCVars = len(designVariables[inputName]["comps"])
HSCBarSub = np.zeros(nHSCVars, "d")
for i in range(nHSCVars):
comp = designVariables[inputName]["comps"][i]
HSCBarSub[i] = HSCBar[comp]
d_inputs[inputName] += HSCBarSub * fBar
else:
d_inputs[inputName] += HSCBar * fBar

# compute dFdField
elif self.dvType[inputName] == "Field":
Expand All @@ -1512,17 +1421,7 @@ def compute_jacvec_product(self, inputs, d_inputs, d_outputs, mode):
DASolver.solverAD.calcdFdFieldAD(
DASolver.xvVec, DASolver.wVec, objFuncName.encode(), inputName.encode(), dFdField
)

# user can prescribe whether the field var is distributed. Default is True
distributed = True
if "distributed" in designVariables[inputName]:
distributed = designVariables[inputName]["distributed"]

if distributed:
fieldBar = DASolver.vec2Array(dFdField)
else:
fieldBar = DASolver.convertMPIVec2SeqArray(dFdField)

fieldBar = DASolver.vec2Array(dFdField)
d_inputs[inputName] += fieldBar * fBar

elif self.dvType[inputName] == "RegPar":
Expand All @@ -1531,16 +1430,8 @@ def compute_jacvec_product(self, inputs, d_inputs, d_outputs, mode):
parameters = inputs[inputName]
product = np.zeros_like(parameters)

modelName = designVariables[inputName]["modelName"]

DASolver.solverAD.calcdFdRegParAD(
volCoords,
states,
parameters,
objFuncName.encode(),
inputName.encode(),
modelName.encode(),
product,
volCoords, states, parameters, objFuncName.encode(), inputName.encode(), product
)

d_inputs[inputName] += product * fBar
Expand Down
Loading