Diff of /MITgcm_contrib/dgoldberg/streamice/streamice_readparms.F

Parent Directory | Revision Log | Revision Graph | Patch

--- MITgcm_contrib/dgoldberg/streamice/streamice_readparms.F	2013/01/27 21:05:50	1.11
+++ MITgcm_contrib/dgoldberg/streamice/streamice_readparms.F	2013/03/07 15:23:19	1.12
@@ -1,4 +1,4 @@
-C $Header: /home/ubuntu/mnt/e9_copy/MITgcm_contrib/dgoldberg/streamice/streamice_readparms.F,v 1.11 2013/01/27 21:05:50 dgoldberg Exp $
+C $Header: /home/ubuntu/mnt/e9_copy/MITgcm_contrib/dgoldberg/streamice/streamice_readparms.F,v 1.12 2013/03/07 15:23:19 dgoldberg Exp $
 C $Name:  $
 
 
@@ -35,7 +35,7 @@
 
       NAMELIST /STREAMICE_PARM01/
      &     streamice_density, streamice_density_ocean_avg,
-     &     A_glen_isothermal, n_glen, eps_glen_min, eps_u_min,
+     &     B_glen_isothermal, n_glen, eps_glen_min, eps_u_min,
      &     C_basal_fric_const, n_basal_friction, 
      &     streamice_vel_update,streamice_cg_tol,streamice_nonlin_tol,
      &     streamice_nonlin_tol_fp,
@@ -46,6 +46,7 @@
      &     STREAMICEsigcoordFile,
      &     STREAMICEthickFile,
      &     STREAMICEcalveMaskFile,
+     &     STREAMICEcostMaskFile,
      &     STREAMICEison,
      &     STREAMICE_dump_mdsio, STREAMICE_tave_mdsio,
      &     STREAMICE_dump_mnc, STREAMICE_tave_mnc,
@@ -63,6 +64,7 @@
      &     STREAMICEbasalTracConfig,
      &     STREAMICEbasalTracFile,
      &     STREAMICEvelOptimFile,
+     &     STREAMICEtopogFile,
      &     STREAMICEhmaskFile,
      &     STREAMICEuFaceBdryFile,
      &     STREAMICEvFaceBdryFile,
@@ -73,7 +75,8 @@
      &     STREAMICE_h_ctrl_const_surf,
      &     streamice_wgt_drift,streamice_wgt_surf,streamice_wgt_vel,
      &     streamice_wgt_avthick, streamice_wgt_tikh, 
-     &     streamice_addl_backstress    
+     &     streamice_addl_backstress,
+     &     streamice_smooth_gl_width    
 
 
       NAMELIST /STREAMICE_PARM02/
@@ -115,7 +118,7 @@
 
       streamice_density = 917. 
       streamice_density_ocean_avg = 1024.
-      A_glen_isothermal = 9.461e-18   !  Pa (-1/3) a
+      B_glen_isothermal = 9.461e-18   !  Pa (-1/3) a
       n_glen = 3.
       eps_glen_min = 1.0e-12
       eps_u_min = 1.0e-6
@@ -139,7 +142,8 @@
       streamice_wgt_surf = 0.     
       streamice_wgt_vel = 0.     
       streamice_wgt_avthick = 0.
-      streamice_addl_backstress = 0.
+      streamice_addl_backstress = 0.0
+      streamice_smooth_gl_width = 0.0
 
       STREAMICEthickInit = 'FILE'
       STREAMICEthickFile = ' '
@@ -149,12 +153,14 @@
       STREAMICEbasalTracConfig = 'UNIFORM'
       STREAMICEbasalTracFile = ' '
       STREAMICEvelOptimFile = ''
+      STREAMICEtopogFile = ''
       STREAMICEhmaskFile = ''
       STREAMICEuFaceBdryFile = ''
       STREAMICEvFaceBdryFile = ''
       STREAMICEuDirichValsFile = ''
       STREAMICEvDirichValsFile = ''
       STREAMICEGlenConstFile = ''
+      STREAMICEcostMaskFile = ''
       STREAMICEGlenConstConfig = 'UNIFORM'
 
       STREAMICEison = .TRUE.