<p><b>dwj07@fsu.edu</b> 2012-12-03 14:05:55 -0700 (Mon, 03 Dec 2012)</p><p><br>
        -- BRANCH COMMIT --<br>
<br>
        Changing back order of FCINCLUDES in Makefiles, so it doesn't conflict with that's in the trunk.<br>
<br>
        Fixing potentially unsafe string assignment in mpas_configure.F.<br>
</p><hr noshade><pre><font color="gray">Modified: branches/ocean_projects/cesm_coupling/src/core_atmos_physics/Makefile
===================================================================
--- branches/ocean_projects/cesm_coupling/src/core_atmos_physics/Makefile        2012-12-03 20:44:52 UTC (rev 2337)
+++ branches/ocean_projects/cesm_coupling/src/core_atmos_physics/Makefile        2012-12-03 21:05:55 UTC (rev 2338)
@@ -226,4 +226,4 @@
.F.o:
        $(RM) $@ $*.mod
        $(CPP) $(CPPFLAGS) $(COREDEF) $(CPPINCLUDES) -DIWORDSIZE=4 -DRWORDSIZE=8 $< > $*.f90
-        $(FC) $(FFLAGS) -c $*.f90 -I../framework -I../operators -I./physics_wrf -I./physics_eaung -I../external/esmf_time_f90 $(FCINCLUDES)
+        $(FC) $(FFLAGS) -c $*.f90 $(FCINCLUDES) -I../framework -I../operators -I./physics_wrf -I./physics_eaung -I../external/esmf_time_f90
Modified: branches/ocean_projects/cesm_coupling/src/core_hyd_atmos/Makefile
===================================================================
--- branches/ocean_projects/cesm_coupling/src/core_hyd_atmos/Makefile        2012-12-03 20:44:52 UTC (rev 2337)
+++ branches/ocean_projects/cesm_coupling/src/core_hyd_atmos/Makefile        2012-12-03 21:05:55 UTC (rev 2338)
@@ -24,4 +24,4 @@
.F.o:
        $(RM) $@ $*.mod
        $(CPP) $(CPPFLAGS) $(CPPINCLUDES) $< > $*.f90
-        $(FC) $(FFLAGS) -c $*.f90 -I../framework -I../operators -I../external/esmf_time_f90 $(FCINCLUDES)
+        $(FC) $(FFLAGS) -c $*.f90 $(FCINCLUDES) -I../framework -I../operators -I../external/esmf_time_f90
Modified: branches/ocean_projects/cesm_coupling/src/core_init_nhyd_atmos/Makefile
===================================================================
--- branches/ocean_projects/cesm_coupling/src/core_init_nhyd_atmos/Makefile        2012-12-03 20:44:52 UTC (rev 2337)
+++ branches/ocean_projects/cesm_coupling/src/core_init_nhyd_atmos/Makefile        2012-12-03 21:05:55 UTC (rev 2338)
@@ -46,7 +46,7 @@
.F.o:
        $(RM) $@ $*.mod
        $(CPP) $(CPPFLAGS) $(CPPINCLUDES) $< > $*.f90
-        $(FC) $(FFLAGS) -c $*.f90 -I../framework -I../operators -I../external/esmf_time_f90 $(FCINCLUDES)
+        $(FC) $(FFLAGS) -c $*.f90 $(FCINCLUDES) -I../framework -I../operators -I../external/esmf_time_f90
.c.o:
        $(CC) $(CFLAGS) $(CPPFLAGS) $(CPPINCLUDES) -c $<
Modified: branches/ocean_projects/cesm_coupling/src/core_nhyd_atmos/Makefile
===================================================================
--- branches/ocean_projects/cesm_coupling/src/core_nhyd_atmos/Makefile        2012-12-03 20:44:52 UTC (rev 2337)
+++ branches/ocean_projects/cesm_coupling/src/core_nhyd_atmos/Makefile        2012-12-03 21:05:55 UTC (rev 2338)
@@ -34,4 +34,4 @@
.F.o:
        $(RM) $@ $*.mod
        $(CPP) $(CPPFLAGS) $(PHYSICS) $(CPPINCLUDES) $< > $*.f90
-        $(FC) $(FFLAGS) -c $*.f90 -I../framework -I../operators -I../core_atmos_physics -I../core_atmos_physics/physics_wrf -I../external/esmf_time_f90 $(FCINCLUDES)
+        $(FC) $(FFLAGS) -c $*.f90 $(FCINCLUDES) -I../framework -I../operators -I../core_atmos_physics -I../core_atmos_physics/physics_wrf -I../external/esmf_time_f90
Modified: branches/ocean_projects/cesm_coupling/src/core_ocean/Makefile
===================================================================
--- branches/ocean_projects/cesm_coupling/src/core_ocean/Makefile        2012-12-03 20:44:52 UTC (rev 2337)
+++ branches/ocean_projects/cesm_coupling/src/core_ocean/Makefile        2012-12-03 21:05:55 UTC (rev 2338)
@@ -234,4 +234,4 @@
.F.o:
        $(RM) $@ $*.mod
        $(CPP) $(CPPFLAGS) $(CPPINCLUDES) $< > $*.f90
-        $(FC) $(FFLAGS) -c $*.f90 -I../framework -I../operators -I../external/esmf_time_f90 $(FCINCLUDES)
+        $(FC) $(FFLAGS) -c $*.f90 $(FCINCLUDES) -I../framework -I../operators -I../external/esmf_time_f90
Modified: branches/ocean_projects/cesm_coupling/src/core_sw/Makefile
===================================================================
--- branches/ocean_projects/cesm_coupling/src/core_sw/Makefile        2012-12-03 20:44:52 UTC (rev 2337)
+++ branches/ocean_projects/cesm_coupling/src/core_sw/Makefile        2012-12-03 21:05:55 UTC (rev 2338)
@@ -27,4 +27,4 @@
.F.o:
        $(RM) $@ $*.mod
        $(CPP) $(CPPFLAGS) $(CPPINCLUDES) $< > $*.f90
-        $(FC) $(FFLAGS) -c $*.f90 -I../framework -I../operators -I../external/esmf_time_f90 $(FCINCLUDES)
+        $(FC) $(FFLAGS) -c $*.f90 $(FCINCLUDES) -I../framework -I../operators -I../external/esmf_time_f90
Modified: branches/ocean_projects/cesm_coupling/src/driver/Makefile
===================================================================
--- branches/ocean_projects/cesm_coupling/src/driver/Makefile        2012-12-03 20:44:52 UTC (rev 2337)
+++ branches/ocean_projects/cesm_coupling/src/driver/Makefile        2012-12-03 21:05:55 UTC (rev 2338)
@@ -15,4 +15,4 @@
.F.o:
        $(RM) $@ $*.mod
        $(CPP) $(CPPFLAGS) $(CPPINCLUDES) $< > $*.f90
-        $(FC) $(FFLAGS) -c $*.f90 -I../framework -I../core_$(CORE) -I../external/esmf_time_f90 $(FCINCLUDES)
+        $(FC) $(FFLAGS) -c $*.f90 $(FCINCLUDES) -I../framework -I../core_$(CORE) -I../external/esmf_time_f90
Modified: branches/ocean_projects/cesm_coupling/src/framework/Makefile
===================================================================
--- branches/ocean_projects/cesm_coupling/src/framework/Makefile        2012-12-03 20:44:52 UTC (rev 2337)
+++ branches/ocean_projects/cesm_coupling/src/framework/Makefile        2012-12-03 21:05:55 UTC (rev 2338)
@@ -68,7 +68,7 @@
.F.o:
        $(RM) $@ $*.mod
        $(CPP) $(CPPFLAGS) $(CPPINCLUDES) $< > $*.f90
-        $(FC) $(FFLAGS) -c $*.f90 -I../external/esmf_time_f90 $(FCINCLUDES)
+        $(FC) $(FFLAGS) -c $*.f90 $(FCINCLUDES) -I../external/esmf_time_f90
.c.o:
        $(CC) $(CFLAGS) $(CPPFLAGS) $(CPPINCLUDES) -c $<
Modified: branches/ocean_projects/cesm_coupling/src/framework/mpas_configure.F
===================================================================
--- branches/ocean_projects/cesm_coupling/src/framework/mpas_configure.F        2012-12-03 20:44:52 UTC (rev 2337)
+++ branches/ocean_projects/cesm_coupling/src/framework/mpas_configure.F        2012-12-03 21:05:55 UTC (rev 2338)
@@ -14,26 +14,23 @@
type (dm_info), intent(in) :: dminfo
character (len=*), optional :: nml_filename
- character (len=StrKIND) :: filename
-
integer :: funit, ierr
#include "config_namelist_defs.inc"
- if(present(nml_filename)) then
- filename = nml_filename
- else
- filename = "namelist.input"
- end if
-
funit = 21
! Set default values for namelist options
#include "config_set_defaults.inc"
if (dminfo % my_proc_id == IO_NODE) then
- write(0,*) 'Reading ', trim(filename)
- open(funit,file=trim(filename),status='old',form='formatted')
+ if (present(nml_filename)) then
+ write(0,*) 'Reading ', trim(nml_filename)
+ open(funit,file=trim(nml_filename),status='old',form='formatted')
+ else
+ write(0,*) 'Reading namelist.input'
+ open(funit,file='namelist.input',status='old',form='formatted')
+ end if
#include "config_namelist_reads.inc"
close(funit)
Modified: branches/ocean_projects/cesm_coupling/src/operators/Makefile
===================================================================
--- branches/ocean_projects/cesm_coupling/src/operators/Makefile        2012-12-03 20:44:52 UTC (rev 2337)
+++ branches/ocean_projects/cesm_coupling/src/operators/Makefile        2012-12-03 21:05:55 UTC (rev 2338)
@@ -17,4 +17,4 @@
.F.o:
        $(RM) $@ $*.mod
        $(CPP) $(CPPFLAGS) $(CPPINCLUDES) $< > $*.f90
-        $(FC) $(FFLAGS) -c $*.f90 -I../framework $(FCINCLUDES)
+        $(FC) $(FFLAGS) -c $*.f90 $(FCINCLUDES) -I../framework
</font>
</pre>