Changeset 26833

Timestamp:

01/28/22 10:30:33 (3 years ago)

Author:

Mathieu Morlighem

Message:

CHG: speeding up FindParam by specifying data type

Location:

issm/trunk-jpl/src/jl/core

Files:

• analyses/masstransportanalysis.jl (modified) (3 diffs)
• analyses/stressbalanceanalysis.jl (modified) (3 diffs)
• analyses/transientanalysis.jl (modified) (1 diff)
• elements.jl (modified) (2 diffs)
• friction.jl (modified) (2 diffs)
• modules.jl (modified) (1 diff)
• parameters.jl (modified) (1 diff)

issm/trunk-jpl/src/jl/core/analyses/masstransportanalysis.jl

@@ -86 +86 @@
         vx_input      = GetInput(element, VxEnum)
         vy_input      = GetInput(element, VyEnum)
-        dt            = FindParam(element, TimesteppingTimeStepEnum)
-        stabilization = FindParam(element, MasstransportStabilizationEnum)
+        dt            = FindParam(Float64, element, TimesteppingTimeStepEnum)
+        stabilization = FindParam(Int64, element, MasstransportStabilizationEnum)
 
         h = CharacteristicLength(element)
@@ -157 +157 @@
    smb_input       = GetInput(element, SmbMassBalanceEnum)
         olevelset_input = GetInput(element, MaskOceanLevelsetEnum)
-        dt            = FindParam(element, TimesteppingTimeStepEnum)
-        stabilization = FindParam(element, MasstransportStabilizationEnum)
+        dt            = FindParam(Float64, element, TimesteppingTimeStepEnum)
+        stabilization = FindParam(Int64, element, MasstransportStabilizationEnum)
 
    #How much is actually grounded?
@@ -221 +221 @@
 
         #Get some parameters
-        rho_water = FindParam(element, MaterialsRhoSeawaterEnum)
-        rho_ice   = FindParam(element, MaterialsRhoIceEnum)
-        H_min     = FindParam(element, MasstransportMinThicknessEnum)
+        rho_water = FindParam(Float64, element, MaterialsRhoSeawaterEnum)
+        rho_ice   = FindParam(Float64, element, MaterialsRhoIceEnum)
+        H_min     = FindParam(Float64, element, MasstransportMinThicknessEnum)
 
         #Now split solution vector into x and y components

issm/trunk-jpl/src/jl/core/analyses/stressbalanceanalysis.jl

@@ -81 +81 @@
 
         #Fetch parameters relevant to solution sequence
-        maxiter = FindParam(femmodel.parameters,StressbalanceMaxiterEnum)
-        restol  = FindParam(femmodel.parameters,StressbalanceRestolEnum)
-        reltol  = FindParam(femmodel.parameters,StressbalanceReltolEnum)
-        abstol  = FindParam(femmodel.parameters,StressbalanceAbstolEnum)
+        maxiter = FindParam(Int64, femmodel.parameters,StressbalanceMaxiterEnum)
+        restol  = FindParam(Float64, femmodel.parameters,StressbalanceRestolEnum)
+        reltol  = FindParam(Float64, femmodel.parameters,StressbalanceReltolEnum)
+        abstol  = FindParam(Float64, femmodel.parameters,StressbalanceAbstolEnum)
 
         #Call solution sequence to compute new speeds
@@ -174 +174 @@
         H_input  = GetInput(element, ThicknessEnum)
         s_input  = GetInput(element, SurfaceEnum)
-        rho_ice  = FindParam(element, MaterialsRhoIceEnum)
-        g        = FindParam(element, ConstantsGEnum)
+        rho_ice  = FindParam(Float64, element, MaterialsRhoIceEnum)
+        g        = FindParam(Float64, element, ConstantsGEnum)
 
         #Start integrating
@@ -197 +197 @@
                 #Get additional parameters and inputs
                 b_input   = GetInput(element, BaseEnum)
-                rho_water = FindParam(element, MaterialsRhoSeawaterEnum)
+                rho_water = FindParam(Float64, element, MaterialsRhoSeawaterEnum)
 
                 #Get normal and ice front coordinates

issm/trunk-jpl/src/jl/core/analyses/transientanalysis.jl

@@ -15 +15 @@
 function Core(analysis::TransientAnalysis,femmodel::FemModel)# {{{
 
-        step      = FindParam(femmodel.parameters, StepEnum)
-        time      = FindParam(femmodel.parameters, TimeEnum)
-        finaltime = FindParam(femmodel.parameters, TimesteppingFinalTimeEnum)
-        yts       = FindParam(femmodel.parameters, ConstantsYtsEnum)
-        dt        = FindParam(femmodel.parameters, TimesteppingTimeStepEnum)
+        step      = FindParam(Int64, femmodel.parameters, StepEnum)
+        time      = FindParam(Float64, femmodel.parameters, TimeEnum)
+        finaltime = FindParam(Float64, femmodel.parameters, TimesteppingFinalTimeEnum)
+        yts       = FindParam(Float64, femmodel.parameters, ConstantsYtsEnum)
+        dt        = FindParam(Float64, femmodel.parameters, TimesteppingTimeStepEnum)
 
-        isstressbalance = FindParam(femmodel.parameters, TransientIsstressbalanceEnum)
-   ismasstransport = FindParam(femmodel.parameters, TransientIsmasstransportEnum)
+        isstressbalance = FindParam(Bool, femmodel.parameters, TransientIsstressbalanceEnum)
+   ismasstransport = FindParam(Bool, femmodel.parameters, TransientIsmasstransportEnum)
 
    while(time < finaltime - (yts*eps(Float64))) #make sure we run up to finaltime.

issm/trunk-jpl/src/jl/core/elements.jl

@@ -149 +149 @@
 
 end # }}}
-function FindParam(element::Tria,enum::IssmEnum) # {{{
-
-        return FindParam(element.parameters, enum)
+function FindParam(::Type{T}, element::Tria, enum::IssmEnum) where T # {{{
+
+        return FindParam(T, element.parameters, enum)
 
 end # }}}
@@ -312 +312 @@
 
 
-        rho_water   = FindParam(element, MaterialsRhoSeawaterEnum)
-        rho_ice     = FindParam(element, MaterialsRhoIceEnum)
+        rho_water   = FindParam(Float64, element, MaterialsRhoSeawaterEnum)
+        rho_ice     = FindParam(Float64, element, MaterialsRhoIceEnum)
         density     = rho_ice/rho_water
 

issm/trunk-jpl/src/jl/core/friction.jl

@@ -19 +19 @@
 function CoreFriction(element::Tria) #{{{
 
-        frictionlaw = FindParam(element, FrictionLawEnum)
+        frictionlaw = FindParam(Int64, element, FrictionLawEnum)
 
         if frictionlaw==1
@@ -26 +26 @@
                 c_input  = GetInput(element, FrictionCoefficientEnum)
 
-                rho_ice   = FindParam(element, MaterialsRhoIceEnum)
-                rho_water = FindParam(element, MaterialsRhoSeawaterEnum)
-                g         = FindParam(element, ConstantsGEnum)
+                rho_ice   = FindParam(Float64, element, MaterialsRhoIceEnum)
+                rho_water = FindParam(Float64, element, MaterialsRhoSeawaterEnum)
+                g         = FindParam(Float64, element, ConstantsGEnum)
 
                 return CoreBuddFriction(H_input, b_input, c_input, rho_ice, rho_water, g)

issm/trunk-jpl/src/jl/core/modules.jl

@@ -302 +302 @@
 
         #Get Step and Time from parameters
-        step = FindParam(femmodel.parameters,StepEnum)
-        time = FindParam(femmodel.parameters,TimeEnum)
+        step = FindParam(Int64, femmodel.parameters,StepEnum)
+        time = FindParam(Float64, femmodel.parameters,TimeEnum)
         
         #Now fetch results

issm/trunk-jpl/src/jl/core/parameters.jl

@@ -46 +46 @@
 
 end#}}}
-function FindParam(parameters::Parameters,enum::IssmEnum) #{{{
+function FindParam(::Type{T}, parameters::Parameters,enum::IssmEnum) where T #{{{
 
         param = parameters.lookup[enum]
-        return GetParameterValue(param)
+        return GetParameterValue(param)::T
 
 end#}}}