[Dart-dev] DART/trunk Revision: 11843

[dart at ucar.edu]

thoar at ucar.edu
2017-07-26 16:41:51 -0600 (Wed, 26 Jul 2017)
139
Adding the AVISO dynamic topography observation converter.
Modified obs_utilities module to support get_short_as_r8() and
get_int_as_r8()




Modified: DART/trunk/common/types_mod.f90
===================================================================
--- DART/trunk/common/types_mod.f90	2017-07-26 17:49:58 UTC (rev 11842)
+++ DART/trunk/common/types_mod.f90	2017-07-26 22:41:51 UTC (rev 11843)
@@ -10,7 +10,7 @@
 implicit none
 private 
 
-public :: i4, i8, r4, c4, r8, c8, digits12
+public :: i2, i4, i8, r4, c4, r8, c8, digits12
 public :: PI, DEG2RAD, RAD2DEG, MISSING_R4, MISSING_R8
 public :: MISSING_I, MISSING_DATA
 public :: SECPERDAY
@@ -39,6 +39,7 @@
 ! all real variables are 64bit, ditto for all integer variables.
 !----------------------------------------------------------------------------
 ! These are TJH's favorites
+! integer, parameter :: i2 = SELECTED_INT_KIND(3)
 ! integer, parameter :: i4 = SELECTED_INT_KIND(8)
 ! integer, parameter :: i8 = SELECTED_INT_KIND(17)
 ! integer, parameter :: r4 = SELECTED_REAL_KIND(6,30)
@@ -48,8 +49,10 @@
 
 ! These comply with the CCM4 standard, as far as I can tell.
 
+  integer, parameter :: i2 = SELECTED_INT_KIND(3)
   integer, parameter :: i4 = SELECTED_INT_KIND(8)
   integer, parameter :: i8 = SELECTED_INT_KIND(13)
+
   integer, parameter :: r4 = SELECTED_REAL_KIND(6,30)
   integer, parameter :: c4 = SELECTED_REAL_KIND(6,30)
 ! comment in only one of the following lines, not both.   the first is the default.

Modified: DART/trunk/obs_def/obs_def_ocean_mod.f90
===================================================================
--- DART/trunk/obs_def/obs_def_ocean_mod.f90	2017-07-26 17:49:58 UTC (rev 11842)
+++ DART/trunk/obs_def/obs_def_ocean_mod.f90	2017-07-26 22:41:51 UTC (rev 11843)
@@ -60,6 +60,23 @@
 !SATELLITE_SSH,                 KIND_SEA_SURFACE_HEIGHT,    COMMON_CODE
 !SATELLITE_SSS,                 KIND_SALINITY,              COMMON_CODE
 !DRY_LAND,                      KIND_DRY_LAND,              COMMON_CODE
+!AltiKa_SEA_SURFACE_ANOMALY,    KIND_SEA_SURFACE_ANOMALY
+!Cryosat2_SEA_SURFACE_ANOMALY,  KIND_SEA_SURFACE_ANOMALY
+!Envisat_SEA_SURFACE_ANOMALY,   KIND_SEA_SURFACE_ANOMALY
+!Envisatn_SEA_SURFACE_ANOMALY,  KIND_SEA_SURFACE_ANOMALY
+!ERS1_SEA_SURFACE_ANOMALY,      KIND_SEA_SURFACE_ANOMALY
+!ERS2_SEA_SURFACE_ANOMALY,      KIND_SEA_SURFACE_ANOMALY
+!GFO_SEA_SURFACE_ANOMALY,       KIND_SEA_SURFACE_ANOMALY
+!Haiyang2A_SEA_SURFACE_ANOMALY, KIND_SEA_SURFACE_ANOMALY
+!J1_SEA_SURFACE_ANOMALY,        KIND_SEA_SURFACE_ANOMALY
+!J1g_SEA_SURFACE_ANOMALY,       KIND_SEA_SURFACE_ANOMALY
+!J1n_SEA_SURFACE_ANOMALY,       KIND_SEA_SURFACE_ANOMALY
+!J2_SEA_SURFACE_ANOMALY,        KIND_SEA_SURFACE_ANOMALY
+!TP_SEA_SURFACE_ANOMALY,        KIND_SEA_SURFACE_ANOMALY
+!TPn_SEA_SURFACE_ANOMALY,       KIND_SEA_SURFACE_ANOMALY
+!DRY_LAND,                      KIND_DRY_LAND,              COMMON_CODE
+!HFRADAR_U_CURRENT_COMPONENT,   KIND_U_CURRENT_COMPONENT,   COMMON_CODE
+!HFRADAR_V_CURRENT_COMPONENT,   KIND_V_CURRENT_COMPONENT,   COMMON_CODE
 !HFRADAR_RADIAL_VELOCITY,       KIND_VELOCITY
 ! END DART PREPROCESS KIND LIST
 
@@ -89,7 +106,8 @@
 !-----------------------------------------------------------------------------
 ! BEGIN DART PREPROCESS USE OF SPECIAL OBS_DEF MODULE
 !  use obs_def_ocean_mod, only : write_hf_radial_vel, read_hf_radial_vel,           &
-!                            interactive_hf_radial_vel, get_expected_hf_radial_vel
+!                            interactive_hf_radial_vel, get_expected_hf_radial_vel, &
+!                            get_sea_surface_anomaly
 ! END DART PREPROCESS USE OF SPECIAL OBS_DEF MODULE
 !-----------------------------------------------------------------------------
 
@@ -97,6 +115,34 @@
 ! BEGIN DART PREPROCESS GET_EXPECTED_OBS_FROM_DEF
 !  case(HFRADAR_RADIAL_VELOCITY)
 !     call get_expected_hf_radial_vel(state, location, obs_def%key, obs_val, istatus)
+!  case(AltiKa_SEA_SURFACE_ANOMALY)
+!     call get_sea_surface_anomaly(state, location, obs_val, istatus)
+!  case(Cryosat2_SEA_SURFACE_ANOMALY)
+!     call get_sea_surface_anomaly(state, location, obs_val, istatus)
+!  case(Envisat_SEA_SURFACE_ANOMALY)
+!     call get_sea_surface_anomaly(state, location, obs_val, istatus)
+!  case(Envisatn_SEA_SURFACE_ANOMALY)
+!     call get_sea_surface_anomaly(state, location, obs_val, istatus)
+!  case(ERS1_SEA_SURFACE_ANOMALY)
+!     call get_sea_surface_anomaly(state, location, obs_val, istatus)
+!  case(ERS2_SEA_SURFACE_ANOMALY)
+!     call get_sea_surface_anomaly(state, location, obs_val, istatus)
+!  case(GFO_SEA_SURFACE_ANOMALY)
+!     call get_sea_surface_anomaly(state, location, obs_val, istatus)
+!  case(Haiyang2A_SEA_SURFACE_ANOMALY)
+!     call get_sea_surface_anomaly(state, location, obs_val, istatus)
+!  case(J1_SEA_SURFACE_ANOMALY)
+!     call get_sea_surface_anomaly(state, location, obs_val, istatus)
+!  case(J1g_SEA_SURFACE_ANOMALY)
+!     call get_sea_surface_anomaly(state, location, obs_val, istatus)
+!  case(J1n_SEA_SURFACE_ANOMALY)
+!     call get_sea_surface_anomaly(state, location, obs_val, istatus)
+!  case(J2_SEA_SURFACE_ANOMALY)
+!     call get_sea_surface_anomaly(state, location, obs_val, istatus)
+!  case(TP_SEA_SURFACE_ANOMALY)
+!     call get_sea_surface_anomaly(state, location, obs_val, istatus)