--- MITgcm_contrib/ESMF/mytools/mkmod.sh	2004/02/22 01:10:49	1.9
+++ MITgcm_contrib/ESMF/mytools/mkmod.sh	2004/02/27 17:09:09	1.11
@@ -1,6 +1,6 @@
 #!<TCSH_PATH> -f
 #
-#$Id: mkmod.sh,v 1.9 2004/02/22 01:10:49 cnh Exp $
+#$Id: mkmod.sh,v 1.11 2004/02/27 17:09:09 cnh Exp $
 #$Name:  $
 #
 # Script to create modules for an MITgcm production code instance
@@ -126,6 +126,9 @@
 # Change all the common block names in the module to use the module prefix
 cat ${mpref_l}_mod.Ftmp | sed s'z\( *COMMON[^/]*\)/\(.*\)/\([^/]*\)z      COMMON/C_'${mpref_s}'_\2/\3z' > f1.Ftmp
 cp f1.Ftmp ${mpref_l}_mod.Ftmp
+cat ${mpref_l}_mod.Ftmp | sed s'/C_'${mpref_s}'_MPIPRIV/MPIPRIV/' > f1.Ftmp
+cp f1.Ftmp ${mpref_l}_mod.Ftmp
+
 
 echo "Compiling code"
 source ${BUILDROOT}/mytools/comp_profile.${COMP_PROF}
@@ -159,5 +162,7 @@
 \rm mmout/lib${mpref_l}.a
 ${arcommand} ${aropts} mmout/lib${mpref_l}.a ${mpref_l}_mod.o component_${mpref_s}_context.o
 #ranlib mmout/lib${mpref_l}.a
-cp ${mpref_l}.mod mmout
-\rm *mod
+set modname = `echo ${mpref_l} | ${mkmodname}`
+echo $modname
+cp ${modname}.mod mmout
+#\rm *mod