--- MITgcm/tools/OAD_support/cb2mGetModules.csh	2012/09/20 23:12:47	1.1
+++ MITgcm/tools/OAD_support/cb2mGetModules.csh	2013/06/21 19:58:16	1.5
@@ -4,7 +4,24 @@
 echo '      MODULE '${fileName}_mod   > ${fileName}_temp
 echo '#include "CPP_OPTIONS.h"'      >> ${fileName}_temp
 echo '#include "CPP_EEOPTIONS.h"'    >> ${fileName}_temp
-echo '#include "GMREDI_OPTIONS.h"'   >> ${fileName}_temp
+if ( ${fileName} == 'DIC_LOAD' ) then
+  echo '#include "DIC_OPTIONS.h"'    >> ${fileName}_temp
+endif
+if ( ${fileName} == 'GAD' ) then
+  echo '#include "GAD_OPTIONS.h"'    >> ${fileName}_temp
+endif
+if ( ${fileName} == 'GMREDI' ) then
+  echo '#include "GMREDI_OPTIONS.h"'    >> ${fileName}_temp
+endif
+if ( ${fileName} == 'MOM_VISC' ) then
+  echo '#include "MOM_COMMON_OPTIONS.h"'    >> ${fileName}_temp
+endif
+if ( ${fileName} == 'SHAP_FILT' ) then
+  echo '#include "SHAP_FILT_OPTIONS.h"'    >> ${fileName}_temp
+endif
+if ( ${fileName} == 'STREAMICE' ) then
+  echo '#include "STREAMICE_OPTIONS.h"'    >> ${fileName}_temp
+endif
 if ( ${fileName} != 'SIZE' &&  ${fileName} != 'MNC_COMMON' &&  ${fileName} != 'EEPARAMS' ) then
   echo '      use SIZE_mod'          >> ${fileName}_temp
 endif
@@ -14,9 +31,14 @@
 if ( ${fileName} != 'PARAMS' && ${fileName} != 'EEPARAMS' &&  ${fileName} != 'SIZE' &&  ${fileName} != 'MNC_COMMON' && ${fileName} != 'GAD' && ${fileName} != 'GRID' ) then
   echo '      use PARAMS_mod'	     >> ${fileName}_temp
 endif
-if ( ${fileName} == 'ctrl_dummy' || ${fileName} == 'CTRL_GENARR' ) then
+if ( ${fileName} == 'ctrl' || ${fileName} == 'ctrl_dummy' || ${fileName} == 'CTRL_GENARR' ) then
   echo '      use CTRL_SIZE_mod'     >> ${fileName}_temp
 endif
+if ( ${fileName} == 'PTRACERS_FIELDS' || ${fileName} == 'PTRACERS_PARAMS' || \
+     ${fileName} == 'PTRACERS_START' || ${fileName} == 'PTRACERS_TAVE' || \
+     ${fileName} == 'GCHEM_FIELDS' ) then
+  echo '      use PTRACERS_SIZE_mod' >> ${fileName}_temp
+endif
 #echo awk -f ${awkScript} ${fileName}.h   
 awk -f ${awkScript} ${fileName}.h | grep -v mpif.h   >> ${fileName}_temp
 echo '      END MODULE' ${fileName}_mod   >> ${fileName}_temp