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

Parent Directory | Revision Log | Revision Graph | Patch

--- MITgcm_contrib/dgoldberg/streamice/streamice_readparms.F	2012/12/10 02:34:45	1.9
+++ MITgcm_contrib/dgoldberg/streamice/streamice_readparms.F	2013/01/09 21:56:18	1.10
@@ -1,4 +1,4 @@
-C $Header: /home/ubuntu/mnt/e9_copy/MITgcm_contrib/dgoldberg/streamice/streamice_readparms.F,v 1.9 2012/12/10 02:34:45 dgoldberg Exp $
+C $Header: /home/ubuntu/mnt/e9_copy/MITgcm_contrib/dgoldberg/streamice/streamice_readparms.F,v 1.10 2013/01/09 21:56:18 dgoldberg Exp $
 C $Name:  $
 
 
@@ -51,6 +51,7 @@
      &     STREAMICE_dump_mnc, STREAMICE_tave_mnc,
      &     STREAMICE_GL_regularize, STREAMICE_move_front,
      &     STREAMICE_calve_to_mask,
+!      &     STREAMICE_geom_file_setup,
      &     STREAMICE_diagnostic_only,
 !     &     STREAMICE_construct_matrix,
      &     STREAMICE_lower_cg_tol,
@@ -62,10 +63,17 @@
      &     STREAMICEbasalTracConfig,
      &     STREAMICEbasalTracFile,
      &     STREAMICEvelOptimFile,
+     &     STREAMICEhmaskFile,
+     &     STREAMICEuFaceBdryFile,
+     &     STREAMICEvFaceBdryFile,
+     &     STREAMICEuDirichValsFile,
+     &     STREAMICEvDirichValsFile, 
+     &     STREAMICEGlenConstFile, STREAMICEGlenConstConfig,
      &     STREAMICE_ppm_driving_stress,
      &     STREAMICE_h_ctrl_const_surf,
      &     streamice_wgt_drift,streamice_wgt_surf,streamice_wgt_vel,
-     &     streamice_wgt_avthick, streamice_addl_backstress    
+     &     streamice_wgt_avthick, streamice_wgt_tikh, 
+     &     streamice_addl_backstress    
 
 
       NAMELIST /STREAMICE_PARM02/
@@ -127,6 +135,7 @@
       streamice_kx_b_init = 1.
       streamice_ky_b_init = 1.
       streamice_wgt_drift = 0.
+      streamice_wgt_tikh = 0.
       streamice_wgt_surf = 0.     
       streamice_wgt_vel = 0.     
       streamice_wgt_avthick = 0.
@@ -140,6 +149,13 @@
       STREAMICEbasalTracConfig = 'UNIFORM'
       STREAMICEbasalTracFile = ' '
       STREAMICEvelOptimFile = ''
+      STREAMICEhmaskFile = ''
+      STREAMICEuFaceBdryFile = ''
+      STREAMICEvFaceBdryFile = ''
+      STREAMICEuDirichValsFile = ''
+      STREAMICEvDirichValsFile = ''
+      STREAMICEGlenConstFile = ''
+      STREAMICEGlenConstConfig = ''
 
       STREAMICEison = .TRUE.
       STREAMICE_tave_mdsio = .TRUE.
@@ -149,6 +165,7 @@
       STREAMICE_GL_regularize = .FALSE.
       STREAMICE_move_front = .FALSE.
       STREAMICE_calve_to_mask = .FALSE.
+!       STREAMICE_geom_file_setup = .FALSE.
 !      STREAMICE_construct_matrix = .TRUE.
       STREAMICE_lower_cg_tol = .FALSE.
       STREAMICE_diagnostic_only = .FALSE.