Changeset 7314 for branches/2016/dev_MERCATOR_2016/NEMOGCM/TOOLS/SIREN/src/phycst.f90

Timestamp:

2016-11-23T09:20:20+01:00 (8 years ago)

Author:

jpaul

Message:

merge with dev_r6999_CONFIGMAN_1

File:

• branches/2016/dev_MERCATOR_2016/NEMOGCM/TOOLS/SIREN/src/phycst.f90 (modified) (2 diffs)

branches/2016/dev_MERCATOR_2016/NEMOGCM/TOOLS/SIREN/src/phycst.f90

@@ -34 +34 @@
    PUBLIC :: dp_siday   !< sideral day                        [s]
 
-   REAL(wp), PUBLIC ::   rday = 24.*60.*60.     !: day                                [s]
-   REAL(wp), PUBLIC ::   rsiyea                 !: sideral year                       [s]
-   REAL(wp), PUBLIC ::   rsiday                 !: sideral day                        [s]
+   REAL(dp), PUBLIC ::   rday = 24.*60.*60.     !: day                                [s]
+   REAL(dp), PUBLIC ::   rsiyea                 !: sideral year                       [s]
+   REAL(dp), PUBLIC ::   rsiday                 !: sideral day                        [s]
 
    REAL(dp), PARAMETER :: dp_pi = 3.14159274101257_dp
-   REAL(dp), PARAMETER :: dp_eps = EPSILON(1._dp)
+   REAL(dp), PARAMETER :: dp_eps = 0.5 * EPSILON(1._dp)
    REAL(dp), PARAMETER :: dp_rearth = 6371229._dp
    REAL(dp), PARAMETER :: dp_deg2rad = dp_pi/180.0
@@ -45 +45 @@
 
    REAL(dp), PARAMETER :: dp_day = 24.*60.*60.     
-   REAL(dp), PARAMETER :: dp_siyea = 365.25_wp * dp_day * &
-      &  2._wp * dp_pi / 6.283076_dp
-   REAL(dp), PARAMETER :: dp_siday = dp_day / ( 1._wp + dp_day / dp_siyea )
+   REAL(dp), PARAMETER :: dp_siyea = 365.25_dp * dp_day * &
+      &  2._dp * dp_pi / 6.283076_dp
+   REAL(dp), PARAMETER :: dp_siday = dp_day / ( 1._dp + dp_day / dp_siyea )
 
-   REAL(dp), PARAMETER :: dp_delta=1.e-6
+   REAL(dp), PARAMETER :: dp_delta=1.e-5
    REAL(dp), PARAMETER :: dp_omega= 2._dp * dp_pi / dp_siday
 END MODULE phycst