Changeset 27347

Timestamp:

10/27/22 11:39:37 (2 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 27344

Location:

issm/trunk

Files:

• . (modified) (view diffs)
• configure.ac (modified) (view diffs)
• etc/environment.sh (modified) (view diffs)
• externalpackages/petsc/install-3.16-linux.sh (modified) (view diffs)
• externalpackages/petsc/install-3.16-mac.sh (modified) (view diffs)
• externalpackages/petsc/install-3.16-pleiades.sh (modified) (view diffs)
• externalpackages/petsc/install-3.17-mac-m1-static.sh (modified) (view diffs)
• externalpackages/petsc/install-3.17-mac-m1.sh (modified) (view diffs)
• jenkins/eis-daskhub-python-nodules (copied) (copied from issm/trunk-jpl/jenkins/eis-daskhub-python-nodules ) (view diffs)
• jenkins/eis-smce-binaries (copied) (copied from issm/trunk-jpl/jenkins/eis-smce-binaries ) (view diffs)
• m4/analyses.m4 (modified) (view diffs)
• src (modified) (view diffs)
• src/c/Makefile.am (modified) (view diffs)
• src/c/analyses/DebrisAnalysis.cpp (copied) (copied from issm/trunk-jpl/src/c/analyses/DebrisAnalysis.cpp ) (view diffs)
• src/c/analyses/DebrisAnalysis.h (copied) (copied from issm/trunk-jpl/src/c/analyses/DebrisAnalysis.h ) (view diffs)
• src/c/analyses/EnumToAnalysis.cpp (modified) (view diffs)
• src/c/analyses/FreeSurfaceBaseAnalysis.cpp (modified) (view diffs)
• src/c/analyses/HydrologyGlaDSAnalysis.cpp (modified) (view diffs)
• src/c/analyses/HydrologyTwsAnalysis.cpp (modified) (view diffs)
• src/c/analyses/LevelsetAnalysis.cpp (modified) (view diffs)
• src/c/analyses/LoveAnalysis.cpp (modified) (view diffs)
• src/c/analyses/MasstransportAnalysis.cpp (modified) (view diffs)
• src/c/analyses/SealevelchangeAnalysis.cpp (modified) (view diffs)
• src/c/analyses/SmbAnalysis.cpp (modified) (view diffs)
• src/c/analyses/StressbalanceAnalysis.cpp (modified) (view diffs)
• src/c/analyses/StressbalanceVerticalAnalysis.cpp (modified) (view diffs)
• src/c/analyses/analyses.h (modified) (view diffs)
• src/c/classes/Elements/Element.cpp (modified) (view diffs)
• src/c/classes/Elements/Element.h (modified) (view diffs)
• src/c/classes/Elements/Penta.cpp (modified) (view diffs)
• src/c/classes/Elements/Penta.h (modified) (view diffs)
• src/c/classes/Elements/Seg.h (modified) (view diffs)
• src/c/classes/Elements/Tetra.h (modified) (view diffs)
• src/c/classes/Elements/Tria.cpp (modified) (view diffs)
• src/c/classes/Elements/Tria.h (modified) (view diffs)
• src/c/classes/FemModel.cpp (modified) (view diffs)
• src/c/classes/GrdLoads.cpp (modified) (view diffs)
• src/c/classes/GrdLoads.h (modified) (view diffs)
• src/c/classes/Inputs/ArrayInput.cpp (modified) (view diffs)
• src/c/classes/Inputs/IntArrayInput.cpp (modified) (view diffs)
• src/c/classes/Loads/Channel.cpp (modified) (view diffs)
• src/c/classes/Node.cpp (modified) (view diffs)
• src/c/classes/Profiler.h (modified) (view diffs)
• src/c/cores/controltao_core.cpp (modified) (view diffs)
• src/c/cores/cores.h (modified) (view diffs)
• src/c/cores/debris_core.cpp (copied) (copied from issm/trunk-jpl/src/c/cores/debris_core.cpp ) (view diffs)
• src/c/cores/love_core.cpp (modified) (view diffs)
• src/c/cores/movingfront_core.cpp (modified) (view diffs)
• src/c/cores/sealevelchange_core.cpp (modified) (view diffs)
• src/c/cores/transient_core.cpp (modified) (view diffs)
• src/c/modules/Calvingx/Calvingx.cpp (modified) (view diffs)
• src/c/modules/FloatingiceMeltingRatex/FloatingiceMeltingRatex.cpp (modified) (view diffs)
• src/c/modules/FloatingiceMeltingRatex/FloatingiceMeltingRatex.h (modified) (view diffs)
• src/c/modules/FrontalForcingsx/FrontalForcingsx.cpp (modified) (view diffs)
• src/c/modules/FrontalForcingsx/FrontalForcingsx.h (modified) (view diffs)
• src/c/modules/ModelProcessorx/CreateNodes.cpp (modified) (view diffs)
• src/c/modules/ModelProcessorx/CreateParameters.cpp (modified) (view diffs)
• src/c/modules/SetActiveNodesLSMx/SetActiveNodesLSMx.cpp (modified) (view diffs)
• src/c/modules/SetActiveNodesLSMx/SetActiveNodesLSMx.h (modified) (view diffs)
• src/c/modules/StochasticForcingx/StochasticForcingx.cpp (modified) (view diffs)
• src/c/modules/SurfaceMassBalancex/Gembx.cpp (modified) (view diffs)
• src/c/modules/SurfaceMassBalancex/SurfaceMassBalancex.cpp (modified) (view diffs)
• src/c/modules/SurfaceMassBalancex/SurfaceMassBalancex.h (modified) (view diffs)
• src/c/shared/Enum/Enum.vim (modified) (view diffs)
• src/c/shared/Enum/EnumDefinitions.h (modified) (view diffs)
• src/c/shared/Enum/EnumToStringx.cpp (modified) (view diffs)
• src/c/shared/Enum/Enumjl.vim (modified) (view diffs)
• src/c/shared/Enum/StringToEnumx.cpp (modified) (view diffs)
• src/c/shared/Random/random.cpp (modified) (view diffs)
• src/c/shared/io/Marshalling/IoCodeConversions.cpp (modified) (view diffs)
• src/m/classes/SMBarma.m (copied) (copied from issm/trunk-jpl/src/m/classes/SMBarma.m ) (view diffs)
• src/m/classes/SMBarma.py (copied) (copied from issm/trunk-jpl/src/m/classes/SMBarma.py ) (view diffs)
• src/m/classes/SMBautoregression.m (deleted)
• src/m/classes/SMBautoregression.py (deleted)
• src/m/classes/SMBdebrisML.m (copied) (copied from issm/trunk-jpl/src/m/classes/SMBdebrisML.m ) (view diffs)
• src/m/classes/autoregressionlinearbasalforcings.m (deleted)
• src/m/classes/autoregressionlinearbasalforcings.py (deleted)
• src/m/classes/basalforcingsbeckmanngoosse.m (modified) (view diffs)
• src/m/classes/calvingparameterization.m (modified) (view diffs)
• src/m/classes/calvingpollard.m (copied) (copied from issm/trunk-jpl/src/m/classes/calvingpollard.m ) (view diffs)
• src/m/classes/clusters/acenet.m (modified) (view diffs)
• src/m/classes/clusters/aci.m (modified) (view diffs)
• src/m/classes/clusters/aurora.m (modified) (view diffs)
• src/m/classes/clusters/aws_issm_solution_server.m (copied) (copied from issm/trunk-jpl/src/m/classes/clusters/aws_issm_solution_server.m ) (view diffs)
• src/m/classes/clusters/camhpc.m (modified) (view diffs)
• src/m/classes/clusters/castor.m (modified) (view diffs)
• src/m/classes/clusters/cloud.m (modified) (view diffs)
• src/m/classes/clusters/cloud.py (modified) (view diffs)
• src/m/classes/clusters/computecanada.m (modified) (view diffs)
• src/m/classes/clusters/cosmos.m (modified) (view diffs)
• src/m/classes/clusters/cyclone.py (modified) (view diffs)
• src/m/classes/clusters/discover.m (modified) (view diffs)
• src/m/classes/clusters/discover.py (modified) (view diffs)
• src/m/classes/clusters/discovery.m (modified) (view diffs)
• src/m/classes/clusters/eis_nasa_smce.py (copied) (copied from issm/trunk-jpl/src/m/classes/clusters/eis_nasa_smce.py ) (view diffs)
• src/m/classes/clusters/fram.py (modified) (view diffs)
• src/m/classes/clusters/frontera.m (modified) (view diffs)
• src/m/classes/clusters/gemini.m (modified) (view diffs)
• src/m/classes/clusters/generic.m (modified) (view diffs)
• src/m/classes/clusters/generic.py (modified) (view diffs)
• src/m/classes/clusters/generic_static.m (modified) (view diffs)
• src/m/classes/clusters/generic_static.py (modified) (view diffs)
• src/m/classes/clusters/greenplanet.m (modified) (view diffs)
• src/m/classes/clusters/hpc.m (modified) (view diffs)
• src/m/classes/clusters/hpc_simba.m (modified) (view diffs)
• src/m/classes/clusters/hpc_simba2.m (copied) (copied from issm/trunk-jpl/src/m/classes/clusters/hpc_simba2.m ) (view diffs)
• src/m/classes/clusters/localpfe.m (modified) (view diffs)
• src/m/classes/clusters/lonestar.m (modified) (view diffs)
• src/m/classes/clusters/maui.m (modified) (view diffs)
• src/m/classes/clusters/pace.m (copied) (copied from issm/trunk-jpl/src/m/classes/clusters/pace.m ) (view diffs)
• src/m/classes/clusters/pfe.m (modified) (view diffs)
• src/m/classes/clusters/pfe.py (modified) (view diffs)
• src/m/classes/clusters/raijin.m (modified) (view diffs)
• src/m/classes/clusters/saga.py (modified) (view diffs)
• src/m/classes/clusters/sherlock.m (modified) (view diffs)
• src/m/classes/clusters/smce_eis.py (deleted)
• src/m/classes/clusters/tetralith.m (modified) (view diffs)
• src/m/classes/clusters/yellowstone.m (modified) (view diffs)
• src/m/classes/debris.m (copied) (copied from issm/trunk-jpl/src/m/classes/debris.m ) (view diffs)
• src/m/classes/fourierlove.py (modified) (view diffs)
• src/m/classes/frontalforcingsrignot.m (modified) (view diffs)
• src/m/classes/frontalforcingsrignotarma.m (copied) (copied from issm/trunk-jpl/src/m/classes/frontalforcingsrignotarma.m ) (view diffs)
• src/m/classes/frontalforcingsrignotarma.py (copied) (copied from issm/trunk-jpl/src/m/classes/frontalforcingsrignotarma.py ) (view diffs)
• src/m/classes/frontalforcingsrignotautoregression.m (deleted)
• src/m/classes/frontalforcingsrignotautoregression.py (deleted)
• src/m/classes/initialization.m (modified) (view diffs)
• src/m/classes/linearbasalforcingsarma.m (copied) (copied from issm/trunk-jpl/src/m/classes/linearbasalforcingsarma.m ) (view diffs)
• src/m/classes/linearbasalforcingsarma.py (copied) (copied from issm/trunk-jpl/src/m/classes/linearbasalforcingsarma.py ) (view diffs)
• src/m/classes/love.m (copied) (copied from issm/trunk-jpl/src/m/classes/love.m ) (view diffs)
• src/m/classes/love.py (copied) (copied from issm/trunk-jpl/src/m/classes/love.py ) (view diffs)
• src/m/classes/model.m (modified) (view diffs)
• src/m/classes/model.py (modified) (view diffs)
• src/m/classes/sealevelmodel.m (modified) (view diffs)
• src/m/classes/sealevelmodel.py (modified) (view diffs)
• src/m/classes/solidearth.m (modified) (view diffs)
• src/m/classes/solidearth.py (modified) (view diffs)
• src/m/classes/stochasticforcing.m (modified) (view diffs)
• src/m/classes/stochasticforcing.py (modified) (view diffs)
• src/m/classes/timesteppingadaptive.m (modified) (view diffs)
• src/m/classes/transient.js (modified) (view diffs)
• src/m/classes/transient.m (modified) (view diffs)
• src/m/classes/transient.py (modified) (view diffs)
• src/m/contrib/defleurian/netCDF/export_netCDF.m (modified) (view diffs)
• src/m/contrib/defleurian/netCDF/export_netCDF.py (modified) (view diffs)
• src/m/io/loadvars.py (modified) (view diffs)
• src/m/plot/plotmodel.m (modified) (view diffs)
• src/m/solve/solveslm.m (modified) (view diffs)
• src/m/solve/solveslm.py (modified) (view diffs)
• src/m/solve/waitonlock.m (modified) (view diffs)
• src/m/solve/waitonlock.py (modified) (view diffs)
• test (modified) (view diffs)
• test/Archives/Archive2002.arch (modified) (view diffs)
• test/Archives/Archive2005.arch (modified) (view diffs)
• test/Archives/Archive2008.arch (modified) (view diffs)
• test/Archives/Archive2070.arch (modified) (view diffs)
• test/Archives/Archive2071.arch (modified) (view diffs)
• test/Archives/Archive2072.arch (modified) (view diffs)
• test/Archives/Archive2073.arch (copied) (copied from issm/trunk-jpl/test/Archives/Archive2073.arch ) (view diffs)
• test/Archives/Archive2090.arch (modified) (view diffs)
• test/Archives/Archive243.arch (modified) (view diffs)
• test/Archives/Archive244.arch (modified) (view diffs)
• test/Archives/Archive252.arch (modified) (view diffs)
• test/Archives/Archive257.arch (modified) (view diffs)
• test/Archives/Archive3203.arch (modified) (view diffs)
• test/Archives/Archive355.arch (modified) (view diffs)
• test/Archives/Archive426.arch (modified) (view diffs)
• test/Archives/Archive427.arch (modified) (view diffs)
• test/Archives/Archive435.arch (modified) (view diffs)
• test/Archives/Archive442.arch (modified) (view diffs)
• test/Archives/Archive443.arch (modified) (view diffs)
• test/Archives/Archive473.arch (modified) (view diffs)
• test/Archives/Archive474.arch (modified) (view diffs)
• test/Archives/Archive475.arch (modified) (view diffs)
• test/Archives/Archive476.arch (modified) (view diffs)
• test/Archives/Archive543.arch (modified) (view diffs)
• test/Archives/Archive544.arch (modified) (view diffs)
• test/Archives/Archive802.arch (modified) (view diffs)
• test/Archives/Archive803.arch (modified) (view diffs)
• test/Archives/Archive805.arch (modified) (view diffs)
• test/Archives/Archive806.arch (modified) (view diffs)
• test/Archives/Archive812.arch (modified) (view diffs)
• test/NightlyRun/runme.m (modified) (view diffs)
• test/NightlyRun/runme.py (modified) (view diffs)
• test/NightlyRun/test101awsissmsolutionserver.m (copied) (copied from issm/trunk-jpl/test/NightlyRun/test101awsissmsolutionserver.m ) (view diffs)
• test/NightlyRun/test101eisnasasmce.py (copied) (copied from issm/trunk-jpl/test/NightlyRun/test101eisnasasmce.py ) (view diffs)
• test/NightlyRun/test2013.m (modified) (view diffs)
• test/NightlyRun/test2070.m (modified) (view diffs)
• test/NightlyRun/test2071.m (modified) (view diffs)
• test/NightlyRun/test2072.m (modified) (view diffs)
• test/NightlyRun/test2073.m (copied) (copied from issm/trunk-jpl/test/NightlyRun/test2073.m ) (view diffs)
• test/NightlyRun/test2084.m (modified) (view diffs)
• test/NightlyRun/test2084.py (modified) (view diffs)
• test/NightlyRun/test243.m (modified) (view diffs)
• test/NightlyRun/test243.py (modified) (view diffs)
• test/NightlyRun/test244.m (modified) (view diffs)
• test/NightlyRun/test244.py (modified) (view diffs)
• test/NightlyRun/test252.m (modified) (view diffs)
• test/NightlyRun/test252.py (modified) (view diffs)
• test/NightlyRun/test257.m (modified) (view diffs)
• test/NightlyRun/test257.py (modified) (view diffs)
• test/NightlyRun/test543.m (modified) (view diffs)
• test/NightlyRun/test543.py (modified) (view diffs)
• test/NightlyRun/test544.m (modified) (view diffs)
• test/NightlyRun/test544.py (modified) (view diffs)