Fix 4 conversion arguments to var_desc calls

  Corrected 4 conversion arguments in calls to var_desc for temperatures and
salinities, so that they are consistent with the units of these variables and
the described purpose of the conversion element of the var_desc type.  Until the
conversion arguments to modify_vardesc and query_vardesc, these incorrect values
were inconsequential, but now they need to be fixed before they are
inadvertently used.  All answers are bitwise identical.

Author: Hallberg-NOAA

src/core/MOM.F90

@@ -2711,20 +2711,20 @@ subroutine initialize_MOM(Time, Time_init, param_file, dirs, CS, &
     if (CS%tv%T_is_conT) then
       vd_T = var_desc(name="contemp", units="Celsius", longname="Conservative Temperature", &
                       cmor_field_name="bigthetao", cmor_longname="Sea Water Conservative Temperature", &
-                      conversion=US%Q_to_J_kg*CS%tv%C_p)
+                      conversion=US%C_to_degC)
     else
       vd_T = var_desc(name="temp", units="degC", longname="Potential Temperature", &
                       cmor_field_name="thetao", cmor_longname="Sea Water Potential Temperature", &
-                      conversion=US%Q_to_J_kg*CS%tv%C_p)
+                      conversion=US%C_to_degC)
     endif
     if (CS%tv%S_is_absS) then
       vd_S = var_desc(name="abssalt", units="g kg-1", longname="Absolute Salinity", &
                       cmor_field_name="absso", cmor_longname="Sea Water Absolute Salinity", &
-                      conversion=0.001*US%S_to_ppt)
+                      conversion=US%S_to_ppt)
     else
       vd_S = var_desc(name="salt", units="psu", longname="Salinity", &
                       cmor_field_name="so", cmor_longname="Sea Water Salinity", &
-                      conversion=0.001*US%S_to_ppt)
+                      conversion=US%S_to_ppt)
     endif
 
     if (advect_TS) then