--- MITgcm_contrib/ESMF/mytools/mkmod.sh	2004/02/21 02:20:35	1.8
+++ MITgcm_contrib/ESMF/mytools/mkmod.sh	2004/03/18 22:19:16	1.13
@@ -1,6 +1,6 @@
-#!<TCSH_PATH> -fxv
+#!<TCSH_PATH> -f
 #
-#$Id: mkmod.sh,v 1.8 2004/02/21 02:20:35 cnh Exp $
+#$Id: mkmod.sh,v 1.13 2004/03/18 22:19:16 cnh Exp $
 #$Name:  $
 #
 # Script to create modules for an MITgcm production code instance
@@ -126,8 +126,12 @@
 # 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.BASE
 source ${BUILDROOT}/mytools/comp_profile.${COMP_PROF}
 
 set compinc  = ( ${compinc} -I${BUILDROOT}/esmf_top )
@@ -139,7 +143,7 @@
 # Create runtime library archive
 set mitgcmrtlo = ( )
 foreach f ( $mitgcmrtl )
- echo " " | $comp $compopts -c ${f}
+ echo " " | $comp $compopts_num -c ${f}
  set mitgcmrtlo = ( $mitgcmrtlo ${f:r}.o )
 end
 ${cccommand} ${ccopts} tim.c
@@ -152,12 +156,14 @@
 mv ${mpref_l}_mod.Ftmp ${mpref_l}_mod.F
 source ${BUILDROOT}/mytools/scommand
 mv foo.F ${mpref_l}_mod.F
-echo " " | $comp $compopts -c ${mpref_l}_mod.F ${complibs} ${compinc}
+echo " " | $comp $compopts_num -c ${mpref_l}_mod.F ${complibs} ${compinc}
 mv ${mpref_l}_mod.F ${mpref_l}_mod.Ftmp
 ./template_comp.sh ${mpref_s}
 ${cccommand} ${ccopts} component_${mpref_s}_context.c
 \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