<p><b>dwj07@fsu.edu</b> 2012-09-12 14:52:57 -0600 (Wed, 12 Sep 2012)</p><p><br>
-- BRANCH COMMIT --<br>
<br>
Renaming driver files for CESM build.<br>
</p><hr noshade><pre><font color="gray">Deleted: branches/ocean_projects/cesm_coupling/src/ocean_cesm_driver/MPASO_CplIndices.F
===================================================================
--- branches/ocean_projects/cesm_coupling/src/ocean_cesm_driver/MPASO_CplIndices.F 2012-09-12 17:21:12 UTC (rev 2158)
+++ branches/ocean_projects/cesm_coupling/src/ocean_cesm_driver/MPASO_CplIndices.F 2012-09-12 20:52:57 UTC (rev 2159)
@@ -1,125 +0,0 @@
-module MPASO_CplIndices
-
- use seq_flds_mod
- use mct_mod
-
- implicit none
-
- SAVE
- public ! By default make data private
-
- ! ocn -> drv
-
- integer :: index_o2x_So_t
- integer :: index_o2x_So_u
- integer :: index_o2x_So_v
- integer :: index_o2x_So_s
- integer :: index_o2x_So_dhdx
- integer :: index_o2x_So_dhdy
- integer :: index_o2x_Fioo_q
- integer :: index_o2x_Faoo_fco2_ocn
- integer :: index_o2x_Faoo_fdms_ocn
-
- ! drv -> ocn
-
- integer :: index_x2o_Si_ifrac ! fractional ice wrt ocean
- integer :: index_x2o_So_duu10n ! 10m wind speed squared (m^2/s^2)
- integer :: index_x2o_Sa_pslv ! sea-level pressure (Pa)
- integer :: index_x2o_Sa_co2prog ! bottom atm level prognostic CO2
- integer :: index_x2o_Sa_co2diag ! bottom atm level diagnostic CO2
- integer :: index_x2o_Foxx_taux ! zonal wind stress (taux) (W/m2 )
- integer :: index_x2o_Foxx_tauy ! meridonal wind stress (tauy) (W/m2 )
- integer :: index_x2o_Foxx_swnet ! net short-wave heat flux (W/m2 )
- integer :: index_x2o_Foxx_sen ! sensible heat flux (W/m2 )
- integer :: index_x2o_Foxx_lat
- integer :: index_x2o_Foxx_lwup ! longwave radiation (up) (W/m2 )
- integer :: index_x2o_Faxa_lwdn ! longwave radiation (down) (W/m2 )
- integer :: index_x2o_Fioi_melth ! heat flux from snow & ice melt (W/m2 )
- integer :: index_x2o_Fioi_meltw ! snow melt flux (kg/m2/s)
- integer :: index_x2o_Fioi_salt ! salt (kg(salt)/m2/s)
- integer :: index_x2o_Foxx_evap ! evaporation flux (kg/m2/s)
- integer :: index_x2o_Faxa_prec
- integer :: index_x2o_Faxa_snow ! water flux due to snow (kg/m2/s)
- integer :: index_x2o_Faxa_rain ! water flux due to rain (kg/m2/s)
- integer :: index_x2o_Faxa_bcphidry ! flux: Black Carbon hydrophilic dry deposition
- integer :: index_x2o_Faxa_bcphodry ! flux: Black Carbon hydrophobic dry deposition
- integer :: index_x2o_Faxa_bcphiwet ! flux: Black Carbon hydrophilic wet deposition
- integer :: index_x2o_Faxa_ocphidry ! flux: Organic Carbon hydrophilic dry deposition
- integer :: index_x2o_Faxa_ocphodry ! flux: Organic Carbon hydrophobic dry deposition
- integer :: index_x2o_Faxa_ocphiwet ! flux: Organic Carbon hydrophilic dry deposition
- integer :: index_x2o_Faxa_dstwet1 ! flux: Size 1 dust -- wet deposition
- integer :: index_x2o_Faxa_dstwet2 ! flux: Size 2 dust -- wet deposition
- integer :: index_x2o_Faxa_dstwet3 ! flux: Size 3 dust -- wet deposition
- integer :: index_x2o_Faxa_dstwet4 ! flux: Size 4 dust -- wet deposition
- integer :: index_x2o_Faxa_dstdry1 ! flux: Size 1 dust -- dry deposition
- integer :: index_x2o_Faxa_dstdry2 ! flux: Size 2 dust -- dry deposition
- integer :: index_x2o_Faxa_dstdry3 ! flux: Size 3 dust -- dry deposition
- integer :: index_x2o_Faxa_dstdry4 ! flux: Size 4 dust -- dry deposition
- integer :: index_x2o_Forr_roff ! river runoff flux (kg/m2/s)
- integer :: index_x2o_Forr_ioff ! ice runoff flux (kg/m2/s)
-
-contains
-
- subroutine MPASO_CplIndicesSet( )
-
- type(mct_aVect) :: o2x ! temporary
- type(mct_aVect) :: x2o ! temporary
-
- ! Determine attribute vector indices
-
- ! create temporary attribute vectors
- call mct_aVect_init(x2o, rList=seq_flds_x2o_fields, lsize=1)
- call mct_aVect_init(o2x, rList=seq_flds_o2x_fields, lsize=1)
-
- index_o2x_So_t = mct_avect_indexra(o2x,'So_t')
- index_o2x_So_u = mct_avect_indexra(o2x,'So_u')
- index_o2x_So_v = mct_avect_indexra(o2x,'So_v')
- index_o2x_So_s = mct_avect_indexra(o2x,'So_s')
- index_o2x_So_dhdx = mct_avect_indexra(o2x,'So_dhdx')
- index_o2x_So_dhdy = mct_avect_indexra(o2x,'So_dhdy')
- index_o2x_Fioo_q = mct_avect_indexra(o2x,'Fioo_q')
- index_o2x_Faoo_fco2_ocn = mct_avect_indexra(o2x,'Faoo_fco2_ocn',perrWith='quiet')
- index_o2x_Faoo_fdms_ocn = mct_avect_indexra(o2x,'Faoo_fdms_ocn',perrWith='quiet')
- index_x2o_Si_ifrac = mct_avect_indexra(x2o,'Si_ifrac')
- index_x2o_Sa_pslv = mct_avect_indexra(x2o,'Sa_pslv')
- index_x2o_So_duu10n = mct_avect_indexra(x2o,'So_duu10n')
-
- index_x2o_Foxx_tauy = mct_avect_indexra(x2o,'Foxx_tauy')
- index_x2o_Foxx_taux = mct_avect_indexra(x2o,'Foxx_taux')
- index_x2o_Foxx_swnet = mct_avect_indexra(x2o,'Foxx_swnet')
- index_x2o_Foxx_lat = mct_avect_indexra(x2o,'Foxx_lat')
- index_x2o_Foxx_sen = mct_avect_indexra(x2o,'Foxx_sen')
- index_x2o_Foxx_lwup = mct_avect_indexra(x2o,'Foxx_lwup')
- index_x2o_Faxa_lwdn = mct_avect_indexra(x2o,'Faxa_lwdn')
- index_x2o_Fioi_melth = mct_avect_indexra(x2o,'Fioi_melth')
- index_x2o_Fioi_meltw = mct_avect_indexra(x2o,'Fioi_meltw')
- index_x2o_Fioi_salt = mct_avect_indexra(x2o,'Fioi_salt')
- index_x2o_Faxa_prec = mct_avect_indexra(x2o,'Faxa_prec')
- index_x2o_Faxa_snow = mct_avect_indexra(x2o,'Faxa_snow')
- index_x2o_Faxa_rain = mct_avect_indexra(x2o,'Faxa_rain')
- index_x2o_Foxx_evap = mct_avect_indexra(x2o,'Foxx_evap')
- index_x2o_Forr_roff = mct_avect_indexra(x2o,'Forr_roff')
- index_x2o_Forr_ioff = mct_avect_indexra(x2o,'Forr_ioff')
- index_x2o_Faxa_bcphidry = mct_avect_indexra(x2o,'Faxa_bcphidry')
- index_x2o_Faxa_bcphodry = mct_avect_indexra(x2o,'Faxa_bcphodry')
- index_x2o_Faxa_bcphiwet = mct_avect_indexra(x2o,'Faxa_bcphiwet')
- index_x2o_Faxa_ocphidry = mct_avect_indexra(x2o,'Faxa_ocphidry')
- index_x2o_Faxa_ocphodry = mct_avect_indexra(x2o,'Faxa_ocphodry')
- index_x2o_Faxa_ocphiwet = mct_avect_indexra(x2o,'Faxa_ocphiwet')
- index_x2o_Faxa_dstdry1 = mct_avect_indexra(x2o,'Faxa_dstdry1')
- index_x2o_Faxa_dstdry2 = mct_avect_indexra(x2o,'Faxa_dstdry2')
- index_x2o_Faxa_dstdry3 = mct_avect_indexra(x2o,'Faxa_dstdry3')
- index_x2o_Faxa_dstdry4 = mct_avect_indexra(x2o,'Faxa_dstdry4')
- index_x2o_Faxa_dstwet1 = mct_avect_indexra(x2o,'Faxa_dstwet1')
- index_x2o_Faxa_dstwet2 = mct_avect_indexra(x2o,'Faxa_dstwet2')
- index_x2o_Faxa_dstwet3 = mct_avect_indexra(x2o,'Faxa_dstwet3')
- index_x2o_Faxa_dstwet4 = mct_avect_indexra(x2o,'Faxa_dstwet4')
- index_x2o_Sa_co2prog = mct_avect_indexra(x2o,'Sa_co2prog',perrWith='quiet')
- index_x2o_Sa_co2diag = mct_avect_indexra(x2o,'Sa_co2diag',perrWith='quiet')
-
- call mct_aVect_clean(x2o)
- call mct_aVect_clean(o2x)
-
- end subroutine MPASO_CplIndicesSet
-
-end module MPASO_CplIndices
Modified: branches/ocean_projects/cesm_coupling/src/ocean_cesm_driver/Makefile
===================================================================
--- branches/ocean_projects/cesm_coupling/src/ocean_cesm_driver/Makefile 2012-09-12 17:21:12 UTC (rev 2158)
+++ branches/ocean_projects/cesm_coupling/src/ocean_cesm_driver/Makefile 2012-09-12 20:52:57 UTC (rev 2159)
@@ -2,16 +2,16 @@
OBJS = ocn_comp_mct.o \
ocn_communicator.o \
- MPASO_CplIndices.o \
+ mpaso_cpl_indices.o \
mpaso_mct_vars.o
all: $(OBJS)
-ocn_comp_mct.o: ocn_communicator.o MPASO_CplIndices.o mpaso_mct_vars.o
+ocn_comp_mct.o: ocn_communicator.o mpaso_cpl_indices.o mpaso_mct_vars.o
ocn_communicator.o:
-MPASO_CplIndices.o:
+mpaso_cpl_indices.o:
mpaso_mct_vars.o:
Copied: branches/ocean_projects/cesm_coupling/src/ocean_cesm_driver/mpaso_cpl_indices.F (from rev 2158, branches/ocean_projects/cesm_coupling/src/ocean_cesm_driver/MPASO_CplIndices.F)
===================================================================
--- branches/ocean_projects/cesm_coupling/src/ocean_cesm_driver/mpaso_cpl_indices.F (rev 0)
+++ branches/ocean_projects/cesm_coupling/src/ocean_cesm_driver/mpaso_cpl_indices.F 2012-09-12 20:52:57 UTC (rev 2159)
@@ -0,0 +1,125 @@
+module mpaso_cpl_indices
+
+ use seq_flds_mod
+ use mct_mod
+
+ implicit none
+
+ SAVE
+ public ! By default make data private
+
+ ! ocn -> drv
+
+ integer :: index_o2x_So_t
+ integer :: index_o2x_So_u
+ integer :: index_o2x_So_v
+ integer :: index_o2x_So_s
+ integer :: index_o2x_So_dhdx
+ integer :: index_o2x_So_dhdy
+ integer :: index_o2x_Fioo_q
+ integer :: index_o2x_Faoo_fco2_ocn
+ integer :: index_o2x_Faoo_fdms_ocn
+
+ ! drv -> ocn
+
+ integer :: index_x2o_Si_ifrac ! fractional ice wrt ocean
+ integer :: index_x2o_So_duu10n ! 10m wind speed squared (m^2/s^2)
+ integer :: index_x2o_Sa_pslv ! sea-level pressure (Pa)
+ integer :: index_x2o_Sa_co2prog ! bottom atm level prognostic CO2
+ integer :: index_x2o_Sa_co2diag ! bottom atm level diagnostic CO2
+ integer :: index_x2o_Foxx_taux ! zonal wind stress (taux) (W/m2 )
+ integer :: index_x2o_Foxx_tauy ! meridonal wind stress (tauy) (W/m2 )
+ integer :: index_x2o_Foxx_swnet ! net short-wave heat flux (W/m2 )
+ integer :: index_x2o_Foxx_sen ! sensible heat flux (W/m2 )
+ integer :: index_x2o_Foxx_lat
+ integer :: index_x2o_Foxx_lwup ! longwave radiation (up) (W/m2 )
+ integer :: index_x2o_Faxa_lwdn ! longwave radiation (down) (W/m2 )
+ integer :: index_x2o_Fioi_melth ! heat flux from snow & ice melt (W/m2 )
+ integer :: index_x2o_Fioi_meltw ! snow melt flux (kg/m2/s)
+ integer :: index_x2o_Fioi_salt ! salt (kg(salt)/m2/s)
+ integer :: index_x2o_Foxx_evap ! evaporation flux (kg/m2/s)
+ integer :: index_x2o_Faxa_prec
+ integer :: index_x2o_Faxa_snow ! water flux due to snow (kg/m2/s)
+ integer :: index_x2o_Faxa_rain ! water flux due to rain (kg/m2/s)
+ integer :: index_x2o_Faxa_bcphidry ! flux: Black Carbon hydrophilic dry deposition
+ integer :: index_x2o_Faxa_bcphodry ! flux: Black Carbon hydrophobic dry deposition
+ integer :: index_x2o_Faxa_bcphiwet ! flux: Black Carbon hydrophilic wet deposition
+ integer :: index_x2o_Faxa_ocphidry ! flux: Organic Carbon hydrophilic dry deposition
+ integer :: index_x2o_Faxa_ocphodry ! flux: Organic Carbon hydrophobic dry deposition
+ integer :: index_x2o_Faxa_ocphiwet ! flux: Organic Carbon hydrophilic dry deposition
+ integer :: index_x2o_Faxa_dstwet1 ! flux: Size 1 dust -- wet deposition
+ integer :: index_x2o_Faxa_dstwet2 ! flux: Size 2 dust -- wet deposition
+ integer :: index_x2o_Faxa_dstwet3 ! flux: Size 3 dust -- wet deposition
+ integer :: index_x2o_Faxa_dstwet4 ! flux: Size 4 dust -- wet deposition
+ integer :: index_x2o_Faxa_dstdry1 ! flux: Size 1 dust -- dry deposition
+ integer :: index_x2o_Faxa_dstdry2 ! flux: Size 2 dust -- dry deposition
+ integer :: index_x2o_Faxa_dstdry3 ! flux: Size 3 dust -- dry deposition
+ integer :: index_x2o_Faxa_dstdry4 ! flux: Size 4 dust -- dry deposition
+ integer :: index_x2o_Forr_roff ! river runoff flux (kg/m2/s)
+ integer :: index_x2o_Forr_ioff ! ice runoff flux (kg/m2/s)
+
+contains
+
+ subroutine mpaso_cpl_indices_set( )
+
+ type(mct_aVect) :: o2x ! temporary
+ type(mct_aVect) :: x2o ! temporary
+
+ ! Determine attribute vector indices
+
+ ! create temporary attribute vectors
+ call mct_aVect_init(x2o, rList=seq_flds_x2o_fields, lsize=1)
+ call mct_aVect_init(o2x, rList=seq_flds_o2x_fields, lsize=1)
+
+ index_o2x_So_t = mct_avect_indexra(o2x,'So_t')
+ index_o2x_So_u = mct_avect_indexra(o2x,'So_u')
+ index_o2x_So_v = mct_avect_indexra(o2x,'So_v')
+ index_o2x_So_s = mct_avect_indexra(o2x,'So_s')
+ index_o2x_So_dhdx = mct_avect_indexra(o2x,'So_dhdx')
+ index_o2x_So_dhdy = mct_avect_indexra(o2x,'So_dhdy')
+ index_o2x_Fioo_q = mct_avect_indexra(o2x,'Fioo_q')
+ index_o2x_Faoo_fco2_ocn = mct_avect_indexra(o2x,'Faoo_fco2_ocn',perrWith='quiet')
+ index_o2x_Faoo_fdms_ocn = mct_avect_indexra(o2x,'Faoo_fdms_ocn',perrWith='quiet')
+ index_x2o_Si_ifrac = mct_avect_indexra(x2o,'Si_ifrac')
+ index_x2o_Sa_pslv = mct_avect_indexra(x2o,'Sa_pslv')
+ index_x2o_So_duu10n = mct_avect_indexra(x2o,'So_duu10n')
+
+ index_x2o_Foxx_tauy = mct_avect_indexra(x2o,'Foxx_tauy')
+ index_x2o_Foxx_taux = mct_avect_indexra(x2o,'Foxx_taux')
+ index_x2o_Foxx_swnet = mct_avect_indexra(x2o,'Foxx_swnet')
+ index_x2o_Foxx_lat = mct_avect_indexra(x2o,'Foxx_lat')
+ index_x2o_Foxx_sen = mct_avect_indexra(x2o,'Foxx_sen')
+ index_x2o_Foxx_lwup = mct_avect_indexra(x2o,'Foxx_lwup')
+ index_x2o_Faxa_lwdn = mct_avect_indexra(x2o,'Faxa_lwdn')
+ index_x2o_Fioi_melth = mct_avect_indexra(x2o,'Fioi_melth')
+ index_x2o_Fioi_meltw = mct_avect_indexra(x2o,'Fioi_meltw')
+ index_x2o_Fioi_salt = mct_avect_indexra(x2o,'Fioi_salt')
+ index_x2o_Faxa_prec = mct_avect_indexra(x2o,'Faxa_prec')
+ index_x2o_Faxa_snow = mct_avect_indexra(x2o,'Faxa_snow')
+ index_x2o_Faxa_rain = mct_avect_indexra(x2o,'Faxa_rain')
+ index_x2o_Foxx_evap = mct_avect_indexra(x2o,'Foxx_evap')
+ index_x2o_Forr_roff = mct_avect_indexra(x2o,'Forr_roff')
+ index_x2o_Forr_ioff = mct_avect_indexra(x2o,'Forr_ioff')
+ index_x2o_Faxa_bcphidry = mct_avect_indexra(x2o,'Faxa_bcphidry')
+ index_x2o_Faxa_bcphodry = mct_avect_indexra(x2o,'Faxa_bcphodry')
+ index_x2o_Faxa_bcphiwet = mct_avect_indexra(x2o,'Faxa_bcphiwet')
+ index_x2o_Faxa_ocphidry = mct_avect_indexra(x2o,'Faxa_ocphidry')
+ index_x2o_Faxa_ocphodry = mct_avect_indexra(x2o,'Faxa_ocphodry')
+ index_x2o_Faxa_ocphiwet = mct_avect_indexra(x2o,'Faxa_ocphiwet')
+ index_x2o_Faxa_dstdry1 = mct_avect_indexra(x2o,'Faxa_dstdry1')
+ index_x2o_Faxa_dstdry2 = mct_avect_indexra(x2o,'Faxa_dstdry2')
+ index_x2o_Faxa_dstdry3 = mct_avect_indexra(x2o,'Faxa_dstdry3')
+ index_x2o_Faxa_dstdry4 = mct_avect_indexra(x2o,'Faxa_dstdry4')
+ index_x2o_Faxa_dstwet1 = mct_avect_indexra(x2o,'Faxa_dstwet1')
+ index_x2o_Faxa_dstwet2 = mct_avect_indexra(x2o,'Faxa_dstwet2')
+ index_x2o_Faxa_dstwet3 = mct_avect_indexra(x2o,'Faxa_dstwet3')
+ index_x2o_Faxa_dstwet4 = mct_avect_indexra(x2o,'Faxa_dstwet4')
+ index_x2o_Sa_co2prog = mct_avect_indexra(x2o,'Sa_co2prog',perrWith='quiet')
+ index_x2o_Sa_co2diag = mct_avect_indexra(x2o,'Sa_co2diag',perrWith='quiet')
+
+ call mct_aVect_clean(x2o)
+ call mct_aVect_clean(o2x)
+
+ end subroutine mpaso_cpl_indices_set
+
+end module mpaso_cpl_indices
Modified: branches/ocean_projects/cesm_coupling/src/ocean_cesm_driver/ocn_comp_mct.F
===================================================================
--- branches/ocean_projects/cesm_coupling/src/ocean_cesm_driver/ocn_comp_mct.F 2012-09-12 17:21:12 UTC (rev 2158)
+++ branches/ocean_projects/cesm_coupling/src/ocean_cesm_driver/ocn_comp_mct.F 2012-09-12 20:52:57 UTC (rev 2159)
@@ -25,7 +25,7 @@
use perf_mod
use ocn_communicator, only: mpi_communicator_ocn
- use MPASO_CplIndices
+ use mpaso_cpl_indices
use mpaso_mct_vars
use mpas_framework
@@ -165,7 +165,7 @@
!
!-----------------------------------------------------------------------
- call MPASO_CplIndicesSet()
+ call mpaso_cpl_indices_set()
! call seq_infodata_GetData( infodata, case_name=runid )
call seq_infodata_GetData( infodata, start_type=starttype)
</font>
</pre>