<p><b>dwj07@fsu.edu</b> 2013-04-02 11:39:52 -0600 (Tue, 02 Apr 2013)</p><p><br>
-- BRANCH COMMIT --<br>
<br>
Moving defintions of modelName, coreName, and version into mpas_constants.F as parameters.<br>
<br>
They are still written to all output files.<br>
</p><hr noshade><pre><font color="gray">Modified: branches/history_attribute/src/framework/Makefile
===================================================================
--- branches/history_attribute/src/framework/Makefile 2013-04-02 17:25:38 UTC (rev 2703)
+++ branches/history_attribute/src/framework/Makefile 2013-04-02 17:39:52 UTC (rev 2704)
@@ -60,7 +60,7 @@
mpas_io_input.o: mpas_grid_types.o mpas_dmpar.o mpas_block_decomp.o mpas_block_creator.o mpas_sort.o mpas_configure.o mpas_timekeeping.o mpas_io_streams.o $(ZOLTANOBJ)
-mpas_io_output.o: mpas_grid_types.o mpas_dmpar.o mpas_sort.o mpas_configure.o mpas_io_streams.o
+mpas_io_output.o: mpas_grid_types.o mpas_dmpar.o mpas_sort.o mpas_configure.o mpas_io_streams.o mpas_constants.o
clean:
$(RM) *.o *.mod *.f90 libframework.a
Modified: branches/history_attribute/src/framework/mpas_constants.F
===================================================================
--- branches/history_attribute/src/framework/mpas_constants.F 2013-04-02 17:25:38 UTC (rev 2703)
+++ branches/history_attribute/src/framework/mpas_constants.F 2013-04-02 17:39:52 UTC (rev 2704)
@@ -3,7 +3,7 @@
! mpas_constants
!
!> \brief MPAS Constant Module
-!> \author Michael Duda
+!> \author Michael Duda, Doug Jacobsen
!> \date 03/27/13
!> \version SVN:$Id$
!> \details
@@ -27,6 +27,7 @@
real (kind=RKIND), parameter :: cv = cp - rgas !< Constant: Specific heat of dry air at constant volume [J kg-1 K-1]
real (kind=RKIND), parameter :: cvpm = -cv/cp !
real (kind=RKIND), parameter :: prandtl = 1.0 !< Constant: Prandtl number
+#include "model_variables.inc"
contains
Modified: branches/history_attribute/src/framework/mpas_io_output.F
===================================================================
--- branches/history_attribute/src/framework/mpas_io_output.F 2013-04-02 17:25:38 UTC (rev 2703)
+++ branches/history_attribute/src/framework/mpas_io_output.F 2013-04-02 17:39:52 UTC (rev 2704)
@@ -334,6 +334,8 @@
mesh &
)
+ use mpas_constants
+
implicit none
type (domain_type), intent(in) :: domain
@@ -345,8 +347,6 @@
integer, dimension(10) :: dimlist
character (len=StrKIND) :: runCmd
-#include "model_variables.inc"
-
write(runCmd,'(a,i0,a,a,a)') 'mpirun -n ',domain % dminfo % nProcs, ' ', trim(coreName), '_model.exe;'
call MPAS_createStream(output_obj % io_stream, trim(output_obj % filename), MPAS_IO_PNETCDF, MPAS_IO_WRITE, 1, nferr)
Modified: branches/history_attribute/src/registry/gen_inc.c
===================================================================
--- branches/history_attribute/src/registry/gen_inc.c 2013-04-02 17:25:38 UTC (rev 2703)
+++ branches/history_attribute/src/registry/gen_inc.c 2013-04-02 17:39:52 UTC (rev 2704)
@@ -174,10 +174,9 @@
FILE *fd;
fd = fopen("model_variables.inc","w");
- fortprintf(fd, " character (len=StrKIND) :: modelName, coreName, version</font>
<font color="red">");
- fortprintf(fd, " modelName = '%s'</font>
<font color="red">", modelname);
- fortprintf(fd, " coreName = '%s'</font>
<font color="red">", corename);
- fortprintf(fd, " version = '%s'</font>
<font color="blue">", version);
+ fortprintf(fd, " character (len=StrKIND) :: modelName = '%s' !< Constant: Name of model</font>
<font color="blue">", modelname);
+ fortprintf(fd, " character (len=StrKIND) :: coreName = '%s' !< Constant: Name of core</font>
<font color="blue">", corename);
+ fortprintf(fd, " character (len=StrKIND) :: version = '%s' !< Constant: Version number</font>
<font color="black">", version);
fclose(fd);
}
</font>
</pre>