[pism/pism] a81ab4: Add #if...#endif to remove a compiler warning

0 views
Skip to first unread message

Constantine Khrulev

unread,
Oct 20, 2021, 12:25:59 AM10/20/21
to pism....@gmail.com
Branch: refs/heads/dev
Home: https://github.com/pism/pism
Commit: a81ab48b932414c2c9295185b85ee9e783abab64
https://github.com/pism/pism/commit/a81ab48b932414c2c9295185b85ee9e783abab64
Author: Constantine Khrulev <ckhr...@alaska.edu>
Date: 2021-10-19 (Tue, 19 Oct 2021)

Changed paths:
M src/util/iceModelVec3.cc

Log Message:
-----------
Add #if...#endif to remove a compiler warning


Commit: ae34fcd8f7dde9d750ff1484b253f2f6e5fe2ae5
https://github.com/pism/pism/commit/ae34fcd8f7dde9d750ff1484b253f2f6e5fe2ae5
Author: Constantine Khrulev <ckhr...@alaska.edu>
Date: 2021-10-19 (Tue, 19 Oct 2021)

Changed paths:
M src/basalstrength/MohrCoulombYieldStress.cc
M src/basalstrength/MohrCoulombYieldStress.hh

Log Message:
-----------
Forward-declare IceModelVec2T in MohrCoulombYieldStress.hh


Commit: d19340b1096e5da08f8327c6d10c7ed40f5352a7
https://github.com/pism/pism/commit/d19340b1096e5da08f8327c6d10c7ed40f5352a7
Author: Constantine Khrulev <ckhr...@alaska.edu>
Date: 2021-10-19 (Tue, 19 Oct 2021)

Changed paths:
R src/coupler/util/ScalarForcing.cc

Log Message:
-----------
Delete an old file (must have missed it when merging branches)


Commit: 9bc8456c3007774ecb1b83179c12dc510253437b
https://github.com/pism/pism/commit/9bc8456c3007774ecb1b83179c12dc510253437b
Author: Constantine Khrulev <ckhr...@alaska.edu>
Date: 2021-10-19 (Tue, 19 Oct 2021)

Changed paths:
M src/basalstrength/ConstantYieldStress.cc
M src/basalstrength/ConstantYieldStress.hh
M src/basalstrength/MohrCoulombYieldStress.cc
M src/basalstrength/MohrCoulombYieldStress.hh
M src/basalstrength/YieldStress.cc
M src/basalstrength/YieldStress.hh
M src/basalstrength/basal_resistance.cc
M src/basalstrength/basal_resistance.hh
M src/coupler/AtmosphereModel.hh
M src/coupler/FrontalMelt.hh
M src/coupler/OceanModel.hh
M src/coupler/SeaLevel.hh
M src/coupler/SurfaceModel.hh
M src/coupler/atmosphere/Anomaly.cc
M src/coupler/atmosphere/Anomaly.hh
M src/coupler/atmosphere/AtmosphereModel.cc
M src/coupler/atmosphere/CosineYearlyCycle.cc
M src/coupler/atmosphere/CosineYearlyCycle.hh
M src/coupler/atmosphere/Delta_P.cc
M src/coupler/atmosphere/Delta_P.hh
M src/coupler/atmosphere/ElevationChange.cc
M src/coupler/atmosphere/ElevationChange.hh
M src/coupler/atmosphere/Factory.cc
M src/coupler/atmosphere/Factory.hh
M src/coupler/atmosphere/Frac_P.cc
M src/coupler/atmosphere/Frac_P.hh
M src/coupler/atmosphere/GivenClimate.cc
M src/coupler/atmosphere/GivenClimate.hh
M src/coupler/atmosphere/OrographicPrecipitation.hh
M src/coupler/atmosphere/PIK.cc
M src/coupler/atmosphere/PIK.hh
M src/coupler/atmosphere/PrecipitationScaling.cc
M src/coupler/atmosphere/PrecipitationScaling.hh
M src/coupler/atmosphere/WeatherStation.cc
M src/coupler/atmosphere/WeatherStation.hh
M src/coupler/atmosphere/YearlyCycle.cc
M src/coupler/atmosphere/YearlyCycle.hh
M src/coupler/frontalmelt/Constant.cc
M src/coupler/frontalmelt/Constant.hh
M src/coupler/frontalmelt/DischargeGiven.cc
M src/coupler/frontalmelt/DischargeGiven.hh
M src/coupler/frontalmelt/DischargeRouting.cc
M src/coupler/frontalmelt/DischargeRouting.hh
M src/coupler/frontalmelt/Factory.cc
M src/coupler/frontalmelt/Factory.hh
M src/coupler/frontalmelt/FrontalMelt.cc
M src/coupler/frontalmelt/Given.cc
M src/coupler/frontalmelt/Given.hh
M src/coupler/ocean/Anomaly.cc
M src/coupler/ocean/Anomaly.hh
M src/coupler/ocean/CompleteOceanModel.cc
M src/coupler/ocean/CompleteOceanModel.hh
M src/coupler/ocean/Constant.cc
M src/coupler/ocean/Constant.hh
M src/coupler/ocean/ConstantPIK.cc
M src/coupler/ocean/ConstantPIK.hh
M src/coupler/ocean/Factory.cc
M src/coupler/ocean/Factory.hh
M src/coupler/ocean/GivenClimate.cc
M src/coupler/ocean/GivenClimate.hh
M src/coupler/ocean/GivenTH.cc
M src/coupler/ocean/GivenTH.hh
M src/coupler/ocean/OceanModel.cc
M src/coupler/ocean/Runoff_SMB.hh
M src/coupler/ocean/sea_level/Delta_SL.hh
M src/coupler/ocean/sea_level/Delta_SL_2D.cc
M src/coupler/ocean/sea_level/Delta_SL_2D.hh
M src/coupler/ocean/sea_level/Factory.cc
M src/coupler/ocean/sea_level/Factory.hh
M src/coupler/ocean/sea_level/SeaLevel.cc
M src/coupler/surface/Anomaly.cc
M src/coupler/surface/Anomaly.hh
M src/coupler/surface/EISMINTII.cc
M src/coupler/surface/EISMINTII.hh
M src/coupler/surface/ElevationChange.cc
M src/coupler/surface/ElevationChange.hh
M src/coupler/surface/Factory.cc
M src/coupler/surface/Factory.hh
M src/coupler/surface/ForceThickness.cc
M src/coupler/surface/ForceThickness.hh
M src/coupler/surface/Formulas.cc
M src/coupler/surface/Formulas.hh
M src/coupler/surface/GivenClimate.cc
M src/coupler/surface/GivenClimate.hh
M src/coupler/surface/ISMIP6Climate.cc
M src/coupler/surface/ISMIP6Climate.hh
M src/coupler/surface/StuffAsAnomaly.cc
M src/coupler/surface/SurfaceModel.cc
M src/coupler/surface/TemperatureIndex.cc
M src/coupler/surface/TemperatureIndex.hh
M src/coupler/surface/localMassBalance.cc
M src/coupler/surface/localMassBalance.hh
M src/earth/BedDef.cc
M src/earth/BedDef.hh
M src/earth/Given.cc
M src/earth/Given.hh
M src/earth/LingleClark.hh
M src/earth/LingleClarkSerial.hh
M src/earth/PointwiseIsostasy.cc
M src/energy/BTU_Full.cc
M src/energy/BTU_Full.hh
M src/energy/BedThermalUnit.cc
M src/energy/BedThermalUnit.hh
M src/energy/BedrockColumn.cc
M src/energy/BedrockColumn.hh
M src/energy/CHSystem.cc
M src/energy/CHSystem.hh
M src/fracturedensity/FractureDensity.cc
M src/fracturedensity/FractureDensity.hh
M src/frontretreat/FrontRetreat.cc
M src/frontretreat/FrontRetreat.hh
M src/frontretreat/PrescribedRetreat.cc
M src/frontretreat/PrescribedRetreat.hh
M src/frontretreat/calving/CalvingAtThickness.cc
M src/frontretreat/calving/CalvingAtThickness.hh
M src/frontretreat/calving/EigenCalving.cc
M src/frontretreat/calving/EigenCalving.hh
M src/frontretreat/calving/FloatKill.cc
M src/frontretreat/calving/FloatKill.hh
M src/frontretreat/calving/HayhurstCalving.cc
M src/frontretreat/calving/HayhurstCalving.hh
M src/frontretreat/calving/StressCalving.cc
M src/frontretreat/calving/StressCalving.hh
M src/frontretreat/calving/vonMisesCalving.cc
M src/frontretreat/calving/vonMisesCalving.hh
M src/frontretreat/util/IcebergRemover.cc
M src/frontretreat/util/IcebergRemover.hh
M src/hydrology/Distributed.cc
M src/hydrology/Distributed.hh
M src/hydrology/EmptyingProblem.cc
M src/hydrology/EmptyingProblem.hh
M src/hydrology/Hydrology.cc
M src/hydrology/Hydrology.hh
M src/hydrology/NullTransport.cc
M src/hydrology/NullTransport.hh
M src/hydrology/Routing.cc
M src/hydrology/Routing.hh
M src/hydrology/SteadyState.cc
M src/hydrology/SteadyState.hh
M src/icebin/IBIceModel.cc
M src/inverse/IPTwoBlockVec.cc
M src/inverse/IPTwoBlockVec.hh
M src/inverse/IP_SSAHardavForwardProblem.cc
M src/inverse/IP_SSAHardavForwardProblem.hh
M src/inverse/IP_SSATaucForwardProblem.cc
M src/inverse/IP_SSATaucForwardProblem.hh
M src/inverse/IP_SSATaucTaoTikhonovProblemLCL.cc
M src/inverse/IP_SSATaucTaoTikhonovProblemLCL.hh
M src/inverse/IP_SSATaucTikhonovGNSolver.cc
M src/inverse/IP_SSATaucTikhonovGNSolver.hh
M src/regional/RegionalYieldStress.cc
M src/regional/RegionalYieldStress.hh
M src/regional/SIAFD_Regional.cc
M src/regional/SIAFD_Regional.hh
M src/regional/SSAFD_Regional.cc
M src/regional/SSAFD_Regional.hh
M src/rheology/FlowLaw.cc
M src/rheology/FlowLaw.hh
M src/rheology/FlowLawFactory.cc
M src/rheology/FlowLawFactory.hh
M src/rheology/Hooke.cc
M src/rheology/Hooke.hh
M src/rheology/PatersonBudd.cc
M src/rheology/PatersonBudd.hh
M src/rheology/PatersonBuddCold.cc
M src/rheology/PatersonBuddCold.hh
M src/rheology/PatersonBuddWarm.cc
M src/rheology/PatersonBuddWarm.hh
M src/stressbalance/SSB_Modifier.cc
M src/stressbalance/SSB_Modifier.hh
M src/stressbalance/ShallowStressBalance.cc
M src/stressbalance/ShallowStressBalance.hh
M src/stressbalance/WeertmanSliding.cc
M src/stressbalance/WeertmanSliding.hh
M src/stressbalance/blatter/Blatter.cc
M src/stressbalance/blatter/Blatter.hh
M src/stressbalance/blatter/BlatterMod.cc
M src/stressbalance/blatter/BlatterMod.hh
M src/stressbalance/sia/BedSmoother.cc
M src/stressbalance/sia/BedSmoother.hh
M src/stressbalance/ssa/SSAFD.cc
M src/stressbalance/ssa/SSAFD.hh
M src/stressbalance/ssa/SSAFEM.cc
M src/stressbalance/ssa/SSAFEM.hh
M src/util/Component.cc
M src/util/Component.hh
M src/util/Config.cc
M src/util/Config.hh
M src/util/Diagnostic.cc
M src/util/Diagnostic.hh
M src/util/EnthalpyConverter.cc
M src/util/EnthalpyConverter.hh
M src/util/error_handling.cc
M src/util/error_handling.hh
M src/util/fem/Element.cc
M src/util/fem/Element.hh
M src/util/io/NC4File.cc
M src/util/io/NC4File.hh
M src/util/io/NC4_Serial.cc
M src/util/io/NC4_Serial.hh
M src/util/io/NCFile.cc
M src/util/io/NCFile.hh
M src/util/io/ParallelIO.cc
M src/util/io/ParallelIO.hh
M src/verification/BTU_Verification.cc
M src/verification/BTU_Verification.hh
M src/verification/PSVerification.cc
M src/verification/PSVerification.hh

Log Message:
-----------
Use C++11 "= default" to mark destructors as default (empty)


Commit: 6fd430dcc1f16b98cb375ad4c106395fcc6e82c4
https://github.com/pism/pism/commit/6fd430dcc1f16b98cb375ad4c106395fcc6e82c4
Author: Constantine Khrulev <ckhr...@alaska.edu>
Date: 2021-10-19 (Tue, 19 Oct 2021)

Changed paths:
M CHANGES.rst

Log Message:
-----------
Fix a typo in the change log


Commit: 7438ea4d5572fcd237bb8138e6fb30ccf50111e3
https://github.com/pism/pism/commit/7438ea4d5572fcd237bb8138e6fb30ccf50111e3
Author: Constantine Khrulev <ckhr...@alaska.edu>
Date: 2021-10-19 (Tue, 19 Oct 2021)

Changed paths:
M src/util/ConfigInterface.cc
M src/util/IceGrid.cc

Log Message:
-----------
Remove some outdated code


Commit: ab46a6cd883eee504d5715325586c2213a5ebf2d
https://github.com/pism/pism/commit/ab46a6cd883eee504d5715325586c2213a5ebf2d
Author: Constantine Khrulev <ckhr...@alaska.edu>
Date: 2021-10-19 (Tue, 19 Oct 2021)

Changed paths:
M src/basalstrength/YieldStress.cc

Log Message:
-----------
Fix a message printed to stdout


Compare: https://github.com/pism/pism/compare/2ef62f387da1...ab46a6cd883e
Reply all
Reply to author
Forward
0 new messages