additional fixes for aquaplanet som

src/components/data_comps/docn/cime_config/config_component.xml

@@ -41,7 +41,7 @@
     driver. The atmosphere/ocean fluxes are computed in the
     coupler. Therefore, the data ocean model does not compute fluxes like
     the data ice model. DOCN has two distinct modes of operation. It can
-    arun as a pure data model, reading in ocean SSTs (normally
+    run as a pure data model, reading in ocean SSTs (normally
     climatological) from input datasets, performing time/spatial
     interpolations, and passing these to the coupler. Alternatively,
     DOCN can compute updated SSTs by running as a slab ocean model where
@@ -50,18 +50,14 @@
     from the driver.
     --- A setting of prescribed assumes the only field in the input stream is SST.
     It also assumes the SST is in Celsius and must be converted to Kelvin.
-    All other fields are set to zero except for ocean salinity, which
-    is set to a constant reference salinity value.
-    Normally the ice fraction data is found in the same data files that
-    provide SST data to the data ocean model. They are normally found in
-    the same file because the SST and ice fraction data are derived from
-    the same observational data sets and are consistent with each other.
-    to the data ocean model. They are normally found in the same file
-    because the SST and ice fraction data are derived from the same
-    observational data sets and are consistent with each other.
-    --- A setting of som (slab ocean model) mode is a prognostic mode.  This mode
-    computes a prognostic sea surface temperature and a freeze/melt
-    potential (surface Q-flux) used by the sea ice model.  This
+    All other fields are set to zero except for ocean salinity, which is set to a 
+    constant reference salinity value. Normally the ice fraction data is found in 
+    the same data files that provide SST data to the data ocean model. They are 
+    normally found in the same file because the SST and ice fraction data are derived 
+    from the same observational data sets and are consistent with each other.
+    --- Settings of som (slab ocean model) or  som_aquap (aquaplanet slab ocean) are 
+    prognostic modes which compute a prognostic sea surface temperature and a 
+    freeze/melt potential (surface Q-flux) used by the sea ice model.  This
     calculation requires an external SOM forcing data file that includes
     ocean mixed layer depths and bottom-of-the-slab Q-fluxes.
     Scientifically appropriate bottom-of-the-slab Q-fluxes are normally
@@ -71,7 +67,14 @@
     appropriate and is provided for testing and development purposes only.
     Users must create scientifically appropriate data for their particular
     application.  A tool is available to derive valid SOM forcing.
-    Default is prescribed.</desc>
+    --- A setting of sst_aquapN (where “N” is an integer index value) is a 
+    type of prescribed SST mode used specifically for an aquaplanet setup in 
+    which global SSTs correspond to an analytic form set by the index value.  
+    Currently, indices for 10 SST profiles are supported [e.g., index 3 corresponds
+    to the “QOBS” profile of Neale and Hoskins (2001, Atmos. Sci. Lett.)]. 
+    With source code modifications, it is possible for users to create their own 
+    analytic SST distributions and match them to indices 11 or greater.  
+    </desc>
   </entry>
 
   <entry id="DOCN_SOM_FILENAME">

src/components/data_comps/docn/docn_comp_mod.F90

@@ -704,7 +704,7 @@ subroutine docn_comp_run( EClock, cdata,  x2o, o2x)
          o2x%rAttr(kswp ,n) = swp
       enddo
 
-   case('SOM','SOM_AQUAP')
+   case('SOM')
       lsize = mct_avect_lsize(o2x)
       do n = 1,SDOCN%nstreams
          call shr_dmodel_translateAV(SDOCN%avs(n),avstrm,avifld,avofld,rearr)
@@ -742,6 +742,43 @@ subroutine docn_comp_run( EClock, cdata,  x2o, o2x)
          enddo
       endif   ! firstcall
 
+   case('SOM_AQUAP')
+      lsize = mct_avect_lsize(o2x)
+      do n = 1,SDOCN%nstreams
+         call shr_dmodel_translateAV(SDOCN%avs(n),avstrm,avifld,avofld,rearr)
+      enddo
+      if (firstcall) then
+         do n = 1,lsize
+            if (.not. read_restart) then
+               somtp(n) = o2x%rAttr(kt,n) + TkFrz
+            endif
+            o2x%rAttr(kt,n) = somtp(n)
+            o2x%rAttr(kq,n) = 0.0_R8
+         enddo
+      else   ! firstcall
+         tfreeze = shr_frz_freezetemp(o2x%rAttr(ks,:)) + TkFrz
+         do n = 1,lsize
+         if (imask(n) /= 0) then
+            !--- pull out h from av for resuse below ---
+            hn = avstrm%rAttr(kh,n)
+            !--- compute new temp ---
+            o2x%rAttr(kt,n) = somtp(n) + &
+               (x2o%rAttr(kswnet,n) + &  ! shortwave 
+                x2o%rAttr(klwup ,n) + &  ! longwave
+                x2o%rAttr(klwdn ,n) + &  ! longwave
+                x2o%rAttr(ksen  ,n) + &  ! sensible
+                x2o%rAttr(klat  ,n) + &  ! latent
+                x2o%rAttr(kmelth,n) - &  ! ice melt
+                avstrm%rAttr(kqbot ,n) - &  ! flux at bottom
+                (x2o%rAttr(ksnow,n)+x2o%rAttr(krofi,n))*latice) * &  ! latent by prec and roff
+                dt/(cpsw*rhosw*hn)
+             !--- compute ice formed or melt potential ---
+            o2x%rAttr(kq,n) = (tfreeze(n) - o2x%rAttr(kt,n))*(cpsw*rhosw*hn)/dt  ! ice formed q>0
+            somtp(n) = o2x%rAttr(kt,n)                                        ! save temp
+         endif
+         enddo
+      endif   ! firstcall
+
    end select
 
    call t_stopf('docn_mode')