Changeset 24077

Timestamp:

07/09/19 17:53:40 (6 years ago)

Author:

schlegel

Message:

CHG: add python nye and minor edits to nye.m

Location:

issm/trunk-jpl/src/m/materials

Files:

• nye.m (modified) (2 diffs)
• nye.py (added)

issm/trunk-jpl/src/m/materials/nye.m

@@ -8 +8 @@
 %   Usage:
 %      rigidity=nye(temperature,ice_type) % ice_type = 1: CO2 ice // ice_type = 2: H2O ice
-
-        if (any(temperature < 130) || any(temperature > 273))
-                error('Input temperature out of bounds (130<T<273)');
+        if ((ice_type == 2) && (any(temperature > 195)))
+                error('Input temperature for CO2 ice out of bounds (T>195)');
+        elseif ((ice_type == 2) && (any(temperature > 273.15)))
+                error('Input temperature for H2O ice out of bounds (T>273.15)');
         end
 
@@ -31 +32 @@
         %Arhenius law
         A = A_const*exp(-Q./(temperature*Rg)); % s^-1 MPa
-        B = A.^(-1/n)*1e6; % s^(1/n) Pa
+        rigidity = A.^(-1/n)*1e6; % s^(1/n) Pa
 
 end