LandIce: changes to some input files.

gahansen · Jan 24, 2019 · 9281afc · 9281afc
1 parent 3d391dd
commit 9281afc
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 11 deletions.
diff --git a/tests/small/LandIce/FO_GIS/input_fo_gis_coupled_shape_opt.yaml b/tests/small/LandIce/FO_GIS/input_fo_gis_coupled_shape_opt.yaml
@@ -56,8 +56,9 @@ ANONYMOUS:
     Element Shape: Tetrahedron
     NumLayers: 5
     Thickness Field Name: ice_thickness
+    Surface Height Field Name: initial_surface_height
     Use Glimmer Spacing: true
-    Extrude Basal Node Fields: [ice_thickness, surface_height, bed_topography]
+    Extrude Basal Node Fields: [ice_thickness, initial_surface_height, bed_topography]
     Basal Node Fields Ranks: [1, 1, 1]
     Interpolate Basal Node Layered Fields: [temperature]
     Basal Node Layered Fields Ranks: [1]
@@ -68,7 +69,7 @@ ANONYMOUS:
         Field Type: Node Scalar
         Field Origin: Mesh
       Field 1: 
-        Field Name: surface_height
+        Field Name: initial_surface_height
         Field Type: Node Scalar
         Field Origin: Mesh
       Field 2: 
@@ -96,7 +97,7 @@ ANONYMOUS:
             Field Origin: File
             File Name: ../AsciiMeshes/GisUnstructFiles/thickness.ascii
           Field 1: 
-            Field Name: surface_height
+            Field Name: initial_surface_height
             Field Type: Node Scalar
             Field Origin: File
             File Name: ../AsciiMeshes/GisUnstructFiles/surface_height.ascii

diff --git a/tests/small/LandIce/FO_Thermo/input_FO_Thermo_test.yaml b/tests/small/LandIce/FO_Thermo/input_FO_Thermo_test.yaml
@@ -7,17 +7,21 @@ ANONYMOUS:
     Name: LandIce Stokes FO Thermo Coupled 3D
     Basal Side Name: basalside
     Required Fields: [basal_friction]
-    Required Basal Fields: [basal_friction, thickness, surface_air_temperature, surface_height, basal_heat_flux]
     Needs Dissipation: true
     Needs Basal Friction: true
     Constant Geothermal Flux: false
     Dirichlet BCs: 
       DBC on NS top for DOF Enth prescribe Field: surface_enthalpy
       DBC on NS bottom for DOF U1: 0.00000000000000000e+00
       DBC on NS lateral for DOF U1: 0.00000000000000000e+00
-    LandIce Basal Friction Coefficient: 
-      Type: Given Field
-      Given Field Variable Name: basal_friction
+    LandIce BCs:
+      Number : 1
+      BC 0:
+        Type: Basal Friction
+        Side Set Name: basalside
+        Basal Friction Coefficient:
+          Type: Given Field
+          Given Field Variable Name: basal_friction
     Parameters: 
       Number: 1
       Parameter 0: 'Glen''s Law Homotopy Parameter'
@@ -84,15 +88,32 @@ ANONYMOUS:
     Interleaved Ordering: true
     Columnwise Ordering: true
     NumLayers: 10
-    Extrude Basal Node Fields: [thickness, surface_height, surface_air_temperature, basal_heat_flux]
+    Thickness Field Name: ice_thickness
+    Extrude Basal Node Fields: [ice_thickness, surface_height, basal_friction, surface_air_temperature]
     Basal Node Fields Ranks: [1, 1, 1, 1, 1]
     Use Glimmer Spacing: true
     Required Fields Info: 
-      Number Of Fields: 1
+      Number Of Fields: 5
       Field 0: 
+        Field Name: ice_thickness
+        Field Type: Node Scalar
+        Field Origin: Mesh
+      Field 1: 
+        Field Name: surface_height
+        Field Type: Node Scalar
+        Field Origin: Mesh
+      Field 2: 
         Field Name: basal_friction
         Field Type: Node Scalar
         Field Origin: Mesh
+      Field 3: 
+        Field Name: surface_air_temperature
+        Field Type: Node Scalar
+        Field Origin: Mesh
+      Field 4: 
+        Field Name: surface_enthalpy
+        Field Type: Node Scalar
+        Field Usage: Output
     Side Set Discretizations: 
       Side Sets: [basalside]
       basalside: 
@@ -109,7 +130,7 @@ ANONYMOUS:
             Field Origin: File
             File Name: ../AsciiMeshes/DomeEnth/basal_friction.ascii
           Field 1: 
-            Field Name: thickness
+            Field Name: ice_thickness
             Field Type: Node Scalar
             Field Origin: File
             File Name: ../AsciiMeshes/DomeEnth/thickness.ascii
@@ -124,7 +145,7 @@ ANONYMOUS:
             Field Origin: File
             File Name: ../AsciiMeshes/DomeEnth/surface_air_temperature.ascii
           Field 4: 
-            Field Name: basal_heat_flux
+            Field Name: heat_flux
             Field Type: Node Scalar
             Field Origin: File
             File Name: ../AsciiMeshes/DomeEnth/basal_heat_flux.ascii