Version 04 of UVic2.9

updates/common/csbc.h

@@ -62,6 +62,9 @@
 !       issphytn15  = sea surface concentration of phytoplankton n15 
 !                     (nmol P cm-3)
 !       iphytn15flx = sea surface flux of phytoplankton n15 (nmol P cm-2 s-1)
+!       isscoccn15  = sea surface concentration of calcifiers n15 
+!                     (nmol P cm-3)
+!       icoccn15flx = sea surface flux of calcifiers n15 (nmol P cm-2 s-1)  
 !       isszoopn15  = sea surface concentration of zooplankton n15 (nmol P cm-3)
 !       izoopn15flx = sea surface flux of zooplankton n15 (nmol P cm-2 s-1)
 !       issdetrn15  = sea surface concentration of detritus n15 (nmol P cm-3)
@@ -70,6 +73,8 @@
 !       idiazn15flx = sea surface flux of diazotraphs (nmol P cm-2 s-1)
 !       issphytc13= sea surface concentration of phytc13 (nmol P cm-3)
 !       iphytc13flx= sea surface flux of phytc13 (nmol P cm-2 s-1)
+!       isscoccc13= sea surface concentration of coccc13 (nmol P cm-3)
+!       icoccc13flx= sea surface flux of coccc13 (nmol P cm-2 s-1)			  
 !       isszoopc13= sea surface concentration of zoopc13 (nmol P cm-3)
 !       izoopc13flx= sea surface flux of zoopc13 (nmol P cm-2 s-1)
 !       issdetrc13= sea surface concentration of detrc13 (nmol P cm-3)
@@ -158,7 +163,7 @@
 #if defined O_carbon
      &                  + 2
 # if defined O_carbon_13
-     &                  + 2
+     &                  + 2		 
 # endif
 # if defined O_carbon_14
      &                  + 2
@@ -171,35 +176,47 @@
      &                  + 2
 #endif
 #if defined O_npzd
-     &                  + 4
+     &                  + 2
 # if !defined O_npzd_no_vflux
      &                  + 6
-# endif
-#endif
-#if defined O_npzd_nitrogen
-     &                  + 4
-# if !defined O_npzd_no_vflux
+#  if defined O_kk_ballast
      &                  + 2
+#  endif
+#  if defined O_npzd_caco3
+     &                  + 4
+#  endif
 # endif
-#if defined O_npzd_iron
+# if defined O_npzd_iron
      &                  + 3
-# if !defined O_npzd_no_vflux
+#  if !defined O_npzd_no_vflux
      &                  + 2
+#  endif
 # endif
-#endif
+# if defined O_npzd_nitrogen
+     &                  + 6
+#  if !defined O_npzd_no_vflux
+     &                  + 2
+#  endif
 #  if defined O_npzd_nitrogen_15
      &                  + 4
 #   if !defined O_npzd_no_vflux
      &                  + 8
+#    if defined O_npzd_caco3
+     &                  + 2
+#    endif		 
 #   endif
 #  endif
-# if defined O_carbon_13
+# endif
+#endif
+#if defined O_carbon_13
      &                  + 2
-#  if !defined O_npzd_no_vflux
+# if !defined O_npzd_no_vflux
      &                  + 6
-#   if defined O_npzd_nitrogen
+#  if defined O_npzd_caco3
+     &                  + 4
+#  endif
+#  if defined O_npzd_nitrogen
      &                  + 2
-#   endif
 #  endif
 # endif
 #endif
@@ -220,7 +237,6 @@
 #endif
 #if defined O_sed
      &                  + 7
-
 # if defined O_carbon
      &                  + 1
 # endif
@@ -249,7 +265,13 @@
       integer issdic13, idic13flx, issdoc13, issphytc13, idoc13flx
       integer iphytc13flx, isszoopc13, izoopc13flx, issdetrc13
       integer idetrc13flx, issdiazc13, idiazc13flx
-
+      integer issdetr_B, idetrflx_B, isscoccc13, icoccc13flx
+      integer isscocc, icoccflx, isscoccn15, icoccn15flx
+      integer isscaco3, icaco3flx, isscaco3c13, icaco3c13flx
+
+      common /csbc_i/ isscaco3, icaco3flx			  
+      common /csbc_i/ isscocc, icoccflx
+      common /csbc_i/ issdetr_B, idetrflx_B
       common /csbc_i/ itaux, itauy, iws, iaca, isca, ihflx, isflx, isst
       common /csbc_i/ isss, iwa, iro, iwxq, iwyq, iwxt, iwyt, iwxc, iwyc
       common /csbc_i/ ipsw, isu, isv, igu, igv, issdic, idicflx, issalk
@@ -266,13 +288,14 @@
       common /csbc_i/ issdin15, idin15flx, issdon15, idon15flx
       common /csbc_i/ issphytn15, iphytn15flx, isszoopn15, izoopn15flx 
       common /csbc_i/ idetrn15flx, issdiazn15, idiazn15flx
-      common /csbc_i/ issdetrn15
+      common /csbc_i/ issdetrn15, isscoccn15, icoccn15flx
       common /csbc_i/ issdic13, idic13flx, issdoc13, idoc13flx 
       common /csbc_i/ issphytc13, iphytc13flx, isszoopc13, izoopc13flx 
       common /csbc_i/ issdetrc13, idetrc13flx, issdiazc13, idiazc13flx
       common /csbc_i/ issdfe, idfeflx, issdetrfe, idetrfeflx
       common /csbc_i/ idfeadep
-
+      common /csbc_i/ isscoccc13, icoccc13flx, isscaco3c13, icaco3c13flx
+
       character(20) :: mapsbc
       common /csbc_c/ mapsbc(numsbc)
 

updates/common/diag.h

@@ -81,13 +81,15 @@
 !     tai_din15     = average nitrate 15
 !     tai_don15     = average don15
 !     tai_phytn15   = average phytoplankton n15
+!     tai_coccn15   = average calcifiers n15			     
 !     tai_zoopn15   = average zooplankton n15
 !     tai_detrn15   = average detritus n15
 !     tai_diazn15   = average diazotrophs n15
 !     tai_dic13     = average DIC13
 !     tai_doc13     = average DOC13
-!     tai_phytc13   = average phytoplankton c15
-!     tai_zoopc13   = average zooplankton c15
+!     tai_phytc13   = average phytoplankton c13
+!     tai_coccc13   = average calcifier c13			     
+!     tai_zoopc13   = average zooplankton c13
 !     tai_detrc13   = average detritus c13
 !     tai_diazc13   = average diazotrophs c13
 !     tai_c14       = average carbon 14
@@ -107,7 +109,10 @@
 !     tai_dicwflx   = average carbon flux from weathering
 !     tai_dfe       = average iron
 !     tai_ddfe      = average particulate fe
-
+!     tai_c         = average coccolithophores
+!     tai_caco3     = average detached calcite
+!     tai_caco3c13  = average detached calcite c13
+
       integer ntatio
       common /cdiagi/ ntatio
 
@@ -121,10 +126,11 @@
       real tai_cocn, tai_cfa2o, tai_dicwflx
       real tai_dop, tai_don
       real tai_din15, tai_don15, tai_phytn15, tai_zoopn15, tai_detrn15
-      real tai_diazn15
+      real tai_diazn15, tai_coccn15, tai_coccc13
       real tai_dic13, tai_doc13, tai_phytc13, tai_zoopc13, tai_detrc13
       real tai_diazc13, tai_dic13flx, tai_dic13wflx, tai_dfe, tai_ddfe
-
+      real tai_d_B, tai_c, tai_caco3, tai_caco3c13, tai_calatt, tcalatt
+
       common /cdiag_r/ tai_ek, tai_t, tai_s, tai_tvar, tai_svar, tai_dt
       common /cdiag_r/ tai_ds, tai_scan, tai_otmax, tai_otmin, tai_slh
       common /cdiag_r/ tai_hflx, tai_sflx, tai_dic, tai_dicflx, tai_alk
@@ -133,12 +139,14 @@
       common /cdiag_r/ tai_cfc11, tai_cfc11flx, tai_cfc12, tai_cfc12flx
       common /cdiag_r/ tai_sspH, tai_ssCO3, tai_ssOc, tai_ssOa
       common /cdiag_r/ tai_sspCO2, tai_cocn, tai_cfa2o, tai_dicwflx
-      common /cdiag_r/ tai_dop, tai_don
+      common /cdiag_r/ tai_dop, tai_don, tai_coccn15
       common /cdiag_r/ tai_din15, tai_don15, tai_phytn15, tai_zoopn15
       common /cdiag_r/ tai_detrn15, tai_diazn15, tai_detr
       common /cdiag_r/ tai_dic13, tai_doc13, tai_phytc13, tai_zoopc13
       common /cdiag_r/ tai_detrc13, tai_diazc13, tai_dic13wflx, tai_dfe
-      common /cdiag_r/ tai_dic13flx, tai_ddfe
+      common /cdiag_r/ tai_dic13flx, tai_ddfe, tai_coccc13, tai_caco3c13
+      common /cdiag_r/ tai_d_B, tai_c, tai_caco3, tai_calatt
+      common /cdiag_r/ tcalatt(0:km,jmt)		       
 # endif
 # if defined O_energy_analysis
 

updates/common/file_names.F

@@ -114,7 +114,7 @@ subroutine file_names
       call put_names ('O_slhref', 'data/O_slhref')
       call put_names ('O_tau', 'data/O_tau')
       call put_names ('O_temp', 'data/O_temp')
-      call put_names ('O_tidenrg_egbert', 'data/O_tidenrg_egbert')
+      call put_names ('O_tidenrg_green', 'data/O_tidenrg_green')
       call put_names ('O_totcarb', 'data/O_totcarb')
       call put_names ('O_fe_dissolved', 'data/O_fe_dissolved')
       call put_names ('O_feflux', 'data/O_feflux')