Changeset 3450 for branches/2012
- Timestamp:
- 2012-08-10T20:45:03+02:00 (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2012/dev_r3438_LOCEAN15_PISLOB/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zfechem.F90
r3449 r3450 154 154 ! compute the roots 155 155 IF( zp > 0.) THEN 156 zphi = ASINH( zq / ( 2. * zr * zr * zr ) ) 156 ! zphi = ASINH( zq / ( 2. * zr * zr * zr ) ) 157 zphi = zq / ( 2. * zr * zr * zr ) 158 zphi = LOG( zphi + SQRT( zphi * zphi + 1 ) ) ! asinh(x) = log( x + sqrt( x*x + 1 ) ) 157 159 zxs = -2. * zr * SINH( zphi / 3. ) - za1 / 3. 158 160 ELSE 159 161 IF( zd > 0. ) THEN 160 162 zfff = MAX( 1., zq / ( 2. * zr * zr * zr ) ) 161 zphi = ACOSH( zfff ) 163 ! zphi = ACOSH( zfff ) 164 zphi = LOG( zfff + SQRT( zfff * zfff - 1 ) ) ! acosh(x) = log( x + sqrt( x*x - 1 ) ) 162 165 zxs = -2. * zr * COSH( zphi / 3. ) - za1 / 3. 163 166 ELSE 164 167 zfff = zq / ( 2. * zr * zr * zr ) 165 168 zfff = MIN( 1., zfff ) 166 zphi = ACOSH( zfff ) 169 !zphi = ACOSH( zfff ) 170 zphi = LOG( zfff + SQRT( zfff * zfff - 1 ) ) ! acosh(x) = log( x + sqrt( x*x - 1 ) ) 167 171 DO jic = 1, 3 168 172 zfunc = -2 * zr * COS( zphi / 3. + 2. * FLOAT( jic - 1 ) * rpi / 3. ) - za2 / 3.
Note: See TracChangeset
for help on using the changeset viewer.