Merge pull request #629 from galacticusorg/fixDestructors

Add missing destructors
galacticusorg · Jun 15, 2024 · 5e7969c · 5e7969c
2 parents f5121c7 + 263dac9
commit 5e7969c
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 10 deletions.
diff --git a/source/output.analyses.Local_Group.mass_metallicity_relation.F90 b/source/output.analyses.Local_Group.mass_metallicity_relation.F90
@@ -488,6 +488,7 @@ function localGroupMassMetallicityRelationConstructorInternal(outputTimes_,galac
     <objectDestructor name="outputAnalysisDistributionOperator_"                   />
     <objectDestructor name="galacticFilterHaloNotIsolated_"                        />
     <objectDestructor name="galacticFilterHostMassRange_"                          />
+    <objectDestructor name="galacticFilterSurveyGeometry_"                         />
     <objectDestructor name="galacticFilter_"                                       />
     <objectDestructor name="surveyGeometry_"                                       />
     !!]

diff --git a/source/output.analyses.Local_Group.mass_size_relation.F90 b/source/output.analyses.Local_Group.mass_size_relation.F90
@@ -503,6 +503,7 @@ function localGroupMassSizeRelationConstructorInternal(outputTimes_,galacticStru
     <objectDestructor name="galacticFilterHaloNotIsolated_"                        />
     <objectDestructor name="galacticFilterHostMassRange_"                          />
     <objectDestructor name="galacticFilterHighPass_"                               />
+    <objectDestructor name="galacticFilterSurveyGeometry_"                         />
     <objectDestructor name="galacticFilter_"                                       />
     <objectDestructor name="surveyGeometry_"                                       />
     !!]

diff --git a/source/output.analyses.Local_Group.mass_velocity_dispersion_relation.F90 b/source/output.analyses.Local_Group.mass_velocity_dispersion_relation.F90
@@ -234,6 +234,7 @@ function localGroupMassVelocityDispersionRelationConstructorInternal(outputTimes
          &                                                                                                     bufferCount                                                 , binCountNonZero
     type            (localGroupDB                                          )                                :: localGroupDB_
     double precision                                                                                        :: massesWidthBin
+    type            (varying_string                                        )               , dimension(1)   :: radiusSpecifier
     !![
     <constructorAssign variables="*outputTimes_, *galacticStructure_, *darkMatterHaloScale_, randomErrorPolynomialCoefficient, systematicErrorPolynomialCoefficient, velocityDispersionSystematicErrorPolynomialCoefficient, covarianceBinomialMassHaloMinimum, covarianceBinomialMassHaloMaximum, randomErrorMinimum, randomErrorMaximum, positionType"/>
     !!]
@@ -320,50 +321,51 @@ function localGroupMassVelocityDispersionRelationConstructorInternal(outputTimes
     ! Create a stellar mass property extractor.
     allocate(nodePropertyExtractor_                                )
     !![
-    <referenceConstruct object="nodePropertyExtractor_"                                 constructor="nodePropertyExtractorMassStellar               (galacticStructure_                                                                                                                          )"/>
+    <referenceConstruct object="nodePropertyExtractor_"                                 constructor="nodePropertyExtractorMassStellar               (galacticStructure_                                                                               )"/>
     !!]
     ! Create a velocity dispersion weight property extractor.
     allocate(outputAnalysisWeightPropertyExtractor_                )
+    radiusSpecifier(1)=var_str('stellarMassFraction{0.5}:all:galactic:lineOfSight:1.0')
     !![
-    <referenceConstruct object="outputAnalysisWeightPropertyExtractor_"                 constructor="nodePropertyExtractorVelocityDispersion        ([var_str('stellarMassFraction{0.5}:all:galactic:lineOfSight:1.0')],.false.,.false.,toleranceRelative,darkMatterHaloScale_,galacticStructure_)"/>
+    <referenceConstruct object="outputAnalysisWeightPropertyExtractor_"                 constructor="nodePropertyExtractorVelocityDispersion        (radiusSpecifier,.false.,.false.,toleranceRelative,darkMatterHaloScale_,galacticStructure_        )"/>
     !!]
     allocate(outputAnalysisWeightPropertyScalarizer_               )
     !![
-    <referenceConstruct object="outputAnalysisWeightPropertyScalarizer_"                 constructor="nodePropertyExtractorScalarizer               (1,1,outputAnalysisWeightPropertyExtractor_                                                                                                  )"/>
+    <referenceConstruct object="outputAnalysisWeightPropertyScalarizer_"                 constructor="nodePropertyExtractorScalarizer               (1,1,outputAnalysisWeightPropertyExtractor_                                                        )"/>
     !!]
     ! Build a size weight property operator.
     allocate(outputAnalysisWeightPropertyOperatorSystmtcPolynomial_)
     !![
-    <referenceConstruct object="outputAnalysisWeightPropertyOperatorSystmtcPolynomial_" constructor="outputAnalysisPropertyOperatorSystmtcPolynomial(velocityDispersionErrorPolynomialZeroPoint,velocityDispersionSystematicErrorPolynomialCoefficient                                           )"/>
+    <referenceConstruct object="outputAnalysisWeightPropertyOperatorSystmtcPolynomial_" constructor="outputAnalysisPropertyOperatorSystmtcPolynomial(velocityDispersionErrorPolynomialZeroPoint,velocityDispersionSystematicErrorPolynomialCoefficient )"/>
     !!]
     allocate(outputAnalysisWeightPropertyOperatorLog10_            )
     !![
-    <referenceConstruct object="outputAnalysisWeightPropertyOperatorLog10_"             constructor="outputAnalysisPropertyOperatorLog10            (                                                                                                                                            )"/>
+    <referenceConstruct object="outputAnalysisWeightPropertyOperatorLog10_"             constructor="outputAnalysisPropertyOperatorLog10            (                                                                                                  )"/>
     !!]
     allocate(weightPropertyOperators_                              )
     allocate(weightPropertyOperators_%next                         )
     weightPropertyOperators_     %operator_ => outputAnalysisWeightPropertyOperatorLog10_
     weightPropertyOperators_%next%operator_ => outputAnalysisWeightPropertyOperatorSystmtcPolynomial_
     allocate(outputAnalysisWeightPropertyOperator_                 )
     !![
-    <referenceConstruct object="outputAnalysisWeightPropertyOperator_"                  constructor="outputAnalysisPropertyOperatorSequence         (weightPropertyOperators_                                                                                                                   )"/>
+    <referenceConstruct object="outputAnalysisWeightPropertyOperator_"                  constructor="outputAnalysisPropertyOperatorSequence         (weightPropertyOperators_                                                                         )"/>
     !!]
     ! Create property operators and unoperators to perform conversion to/from logarithmic mass.
     allocate(outputAnalysisPropertyOperatorLog10_            )
     !![
-    <referenceConstruct object="outputAnalysisPropertyOperatorLog10_"                   constructor="outputAnalysisPropertyOperatorLog10            (                                                                                                                                           )"/>
+    <referenceConstruct object="outputAnalysisPropertyOperatorLog10_"                   constructor="outputAnalysisPropertyOperatorLog10            (                                                                                                 )"/>
     !!]
     allocate(outputAnalysisPropertyOperatorSystmtcPolynomial_)
     !![
-    <referenceConstruct object="outputAnalysisPropertyOperatorSystmtcPolynomial_"       constructor="outputAnalysisPropertyOperatorSystmtcPolynomial(errorZeroPoint              ,systematicErrorPolynomialCoefficient                                                                          )"/>
+    <referenceConstruct object="outputAnalysisPropertyOperatorSystmtcPolynomial_"       constructor="outputAnalysisPropertyOperatorSystmtcPolynomial(errorZeroPoint              ,systematicErrorPolynomialCoefficient                                )"/>
     !!]
     allocate(operators_     )
     allocate(operators_%next)
     operators_     %operator_ => outputAnalysisPropertyOperatorLog10_
     operators_%next%operator_ => outputAnalysisPropertyOperatorSystmtcPolynomial_
     allocate(outputAnalysisPropertyOperator_                 )
     !![
-    <referenceConstruct object="outputAnalysisPropertyOperator_"                        constructor="outputAnalysisPropertyOperatorSequence         (operators_                                                                                                                                 )"/>
+    <referenceConstruct object="outputAnalysisPropertyOperator_"                        constructor="outputAnalysisPropertyOperatorSequence         (operators_                                                                                       )"/>
     !!]
     allocate(outputAnalysisPropertyUnoperator_               )
     !![
@@ -516,6 +518,7 @@ function localGroupMassVelocityDispersionRelationConstructorInternal(outputTimes
     <objectDestructor name="galacticFilterHaloNotIsolated_"                        />
     <objectDestructor name="galacticFilterHostMassRange_"                          />
     <objectDestructor name="galacticFilterHighPass_"                               />
+    <objectDestructor name="galacticFilterSurveyGeometry_"                         />
     <objectDestructor name="galacticFilter_"                                       />
     <objectDestructor name="surveyGeometry_"                                       />
     !!]

diff --git a/source/output.analyses.Local_Group.occupation_fraction.F90 b/source/output.analyses.Local_Group.occupation_fraction.F90
@@ -428,6 +428,7 @@ function localGroupOccupationFractionConstructorInternal(outputTimes_,galacticSt
     <objectDestructor name="outputAnalysisDistributionOperator_"                   />
     <objectDestructor name="galacticFilterHaloNotIsolated_"                        />
     <objectDestructor name="galacticFilterHostMassRange_"                          />
+    <objectDestructor name="galacticFilterSurveyGeometry_"                         />
     <objectDestructor name="galacticFilter_"                                       />
     <objectDestructor name="surveyGeometry_"                                       />
     !!]

diff --git a/source/output.analyses.Local_Group.stellar_mass_function.F90 b/source/output.analyses.Local_Group.stellar_mass_function.F90
@@ -497,6 +497,7 @@ function localGroupStellarMassFunctionConstructorInternal(outputTimes_,galacticS
     <objectDestructor name="galacticFilterHostMassRange_"                    />
     <objectDestructor name="galacticFilterCentrals_"                         />
     <objectDestructor name="galacticFilterSatellites_"                       />
+    <objectDestructor name="galacticFilterSurveyGeometry_"                   />
     <objectDestructor name="outputAnalysisDistributionNormalizerSatellites_" />
     <objectDestructor name="outputAnalysisDistributionNormalizerCentrals_"   />
     <objectDestructor name="surveyGeometryClassical_"                        />

diff --git a/source/output.analyses.Local_Group.stellar_mass_halo_mass_relation.F90 b/source/output.analyses.Local_Group.stellar_mass_halo_mass_relation.F90
@@ -424,6 +424,8 @@ function localGroupStellarMassHaloMassRelationConstructorInternal(outputTimes_,g
     <objectDestructor name="outputAnalysisDistributionOperator_"                   />
     <objectDestructor name="galacticFilterHaloNotIsolated_"                        />
     <objectDestructor name="galacticFilterHostMassRange_"                          />
+    <objectDestructor name="galacticFilterStellarMass_"                            />
+    <objectDestructor name="galacticFilterSurveyGeometry_"                         />
     <objectDestructor name="galacticFilter_"                                       />
     <objectDestructor name="surveyGeometry_"                                       />
     !!]

diff --git a/source/output.analyses.Sunyaev-Zeldovich_Planck2013.F90 b/source/output.analyses.Sunyaev-Zeldovich_Planck2013.F90
@@ -190,7 +190,7 @@ function sunyaevZeldovichPlanck2013ConstructorInternal(systematicErrorPolynomial
     integer         (c_size_t                                           ), parameter                     :: bufferCount                                     =10
     integer         (c_size_t                                           )                                :: iBin                                                      , binCount
     !![
-    <constructurAssign variables="systematicErrorPolynomialCoefficient, randomErrorPolynomialCoefficient, randomErrorMinimum, randomErrorMaximum, *cosmologyParameters_, *cosmologyFunctions_, *darkMatterHaloScale_, *hotHaloMassDistribution_, *hotHaloTemperatureProfile_, *chemicalState_, *galacticStructure_"/>
+    <constructorAssign variables="systematicErrorPolynomialCoefficient, randomErrorPolynomialCoefficient, randomErrorMinimum, randomErrorMaximum, *cosmologyParameters_, *cosmologyFunctions_, *darkMatterHaloScale_, *hotHaloMassDistribution_, *hotHaloTemperatureProfile_, *chemicalState_, *galacticStructure_"/>
     !!]
 
     ! Construct the target data.