Diff of /MITgcm_contrib/dgoldberg/streamice/STREAMICE.h

Parent Directory | Revision Log | Revision Graph | Patch

--- MITgcm_contrib/dgoldberg/streamice/STREAMICE.h	2012/12/10 02:34:45	1.17
+++ MITgcm_contrib/dgoldberg/streamice/STREAMICE.h	2013/01/09 21:56:17	1.18
@@ -15,6 +15,7 @@
      & streamice_kx_b_init, streamice_ky_b_init,
      & streamice_wgt_drift, streamice_wgt_surf,
      & streamice_wgt_avthick, streamice_wgt_vel, 
+     & streamice_wgt_tikh,
      & streamice_addl_backstress
       _RL streamice_density, streamice_density_ocean_avg
       _RL A_glen_isothermal, n_glen, eps_glen_min, eps_u_min
@@ -30,6 +31,7 @@
       _RL streamice_kx_b_init, streamice_ky_b_init
       _RL streamice_wgt_drift, streamice_wgt_surf
       _RL streamice_wgt_avthick, streamice_wgt_vel
+      _RL streamice_wgt_tikh
       _RL streamice_addl_backstress
       
       
@@ -78,8 +80,20 @@
       CHARACTER*(MAX_LEN_FNAM) STREAMICEsigcoordFile
       CHARACTER*(MAX_LEN_FNAM) STREAMICEdelsigFile
       CHARACTER*(MAX_LEN_FNAM) STREAMICEbasalTracConfig
+      CHARACTER*(MAX_LEN_FNAM) STREAMICEGlenConstConfig
       CHARACTER*(MAX_LEN_FNAM) STREAMICEbasalTracFile
+      CHARACTER*(MAX_LEN_FNAM) STREAMICEGlenConstFile
       CHARACTER*(MAX_LEN_FNAM) STREAMICEvelOptimFile
+      
+!     THE FOLLOWING FILENAMES ARE FOR SPECIFYING IRREGULAR DOMAIN GEOMETRIES 
+!     (i.e. boundaries that do not conform with rectangular walls)
+      CHARACTER*(MAX_LEN_FNAM) STREAMICEhmaskFile
+      CHARACTER*(MAX_LEN_FNAM) STREAMICEuFaceBdryFile
+      CHARACTER*(MAX_LEN_FNAM) STREAMICEvFaceBdryFile
+      CHARACTER*(MAX_LEN_FNAM) STREAMICEuDirichValsFile
+      CHARACTER*(MAX_LEN_FNAM) STREAMICEvDirichValsFile
+      
+      
       COMMON /STREAMICE_PARM_C/ 
      &     STREAMICEthickInit,
      &     STREAMICEthickFile,
@@ -89,7 +103,14 @@
      &     STREAMICEdelsigFile,
      &     STREAMICEbasalTracConfig,
      &     STREAMICEbasalTracFile,
-     &     STREAMICEvelOptimFile
+     &     STREAMICEvelOptimFile,
+     &     STREAMICEhmaskFile,
+     &     STREAMICEuFaceBdryFile,
+     &     STREAMICEvFaceBdryFile,
+     &     STREAMICEuDirichValsFile,
+     &     STREAMICEvDirichValsFile,
+     &     STREAMICEGlenConstFile,
+     &     STREAMICEGlenConstConfig
      
 C     -------------------------- LOGICAL PARAMS ---------------------------------------------------
 
@@ -220,7 +241,7 @@
      &     STREAMICE_dummy_array,
      &     C_basal_friction,
      &     A_glen,
-     &     BDOT_streamice,
+     &     BDOT_streamice, ADOT_streamice,  ! mass balances in meters per year
      &     streamice_sigma_coord, streamice_delsigma,
      &     H_streamice_prev
 
@@ -278,6 +299,7 @@
 #endif      
       
       
+      _RL ADOT_streamice (1-OLx:sNx+OLx,1-OLy:sNy+OLy,nSx,nSy)
 !! IMPORTANT: MELT RATE IN METERS PER YEAR
 !! POSITIVE WHERE MELTING
       _RL BDOT_streamice (1-OLx:sNx+OLx,1-OLy:sNy+OLy,nSx,nSy)