Changeset 2236 for branches/DEV_r2106_LOCEAN2010/NEMO/OPA_SRC/DOM
- Timestamp:
- 2010-10-12T20:49:32+02:00 (14 years ago)
- Location:
- branches/DEV_r2106_LOCEAN2010/NEMO/OPA_SRC/DOM
- Files:
-
- 13 edited
-
closea.F90 (modified) (1 diff)
-
daymod.F90 (modified) (5 diffs)
-
dom_oce.F90 (modified) (4 diffs)
-
domain.F90 (modified) (1 diff)
-
domcfg.F90 (modified) (1 diff)
-
domhgr.F90 (modified) (1 diff)
-
dommsk.F90 (modified) (1 diff)
-
domngb.F90 (modified) (1 diff)
-
domstp.F90 (modified) (1 diff)
-
domvvl.F90 (modified) (1 diff)
-
domzgr.F90 (modified) (5 diffs)
-
domzgr_substitute.h90 (modified) (1 diff)
-
phycst.F90 (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
branches/DEV_r2106_LOCEAN2010/NEMO/OPA_SRC/DOM/closea.F90
r2000 r2236 46 46 !! OPA 9.0 , LOCEAN-IPSL (2006) 47 47 !! $Id$ 48 !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)48 !! Software governed by the CeCILL licence (NEMOGCM/License_CeCILL.txt) 49 49 !!---------------------------------------------------------------------- 50 50 -
branches/DEV_r2106_LOCEAN2010/NEMO/OPA_SRC/DOM/daymod.F90
r2200 r2236 45 45 !! NEMO/OPA 3.2 , LOCEAN-IPSL (2009) 46 46 !! $Id$ 47 !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)47 !! Software governed by the CeCILL licence (NEMOGCM/License_CeCILL.txt) 48 48 !!---------------------------------------------------------------------- 49 49 … … 67 67 !! - nmonth_len, nyear_len, nmonth_half, nmonth_end through day_mth 68 68 !!---------------------------------------------------------------------- 69 INTEGER :: inbday, irest 70 REAL(wp) :: zjul 71 !!---------------------------------------------------------------------- 69 72 70 73 ! all calendar staff is based on the fact that MOD( rday, rdttra(1) ) == 0 … … 105 108 ! day since january 1st 106 109 nday_year = nday + SUM( nmonth_len(1:nmonth - 1) ) 107 110 111 !compute number of days between last monday and today 112 IF( nn_leapy==1 )THEN 113 CALL ymds2ju( 1900, 01, 01, 0.0, zjul ) ! compute julian day value of 01.01.1900 (monday) 114 inbday = INT(fjulday) - NINT(zjul) ! compute nb day between 01.01.1900 and current day fjulday 115 irest = MOD(inbday,7) ! compute nb day between last monday and current day fjulday 116 IF(irest==0 )irest = 7 117 ENDIF 118 108 119 ! number of seconds since the beginning of current year/month at the middle of the time-step 109 120 nsec_year = nday_year * nsecd - ndt05 ! 1 time step before the middle of the first time step 110 121 nsec_month = nday * nsecd - ndt05 ! because day will be called at the beginning of step 111 122 nsec_day = nsecd - ndt05 123 nsec_week = 0 124 IF( nn_leapy==1 ) nsec_week = irest * nsecd - ndt05 112 125 113 126 ! control print 114 127 IF(lwp) WRITE(numout,'(a,i6,a,i2,a,i2,a,i6)')' ==============>> 1/2 time step before the start of the run DATE Y/M/D = ', & 115 & nyear, '/', nmonth, '/', nday, ' nsec_day:', nsec_day 128 & nyear, '/', nmonth, '/', nday, ' nsec_day:', nsec_day, ' nsec_week:', nsec_week 116 129 117 130 ! Up to now, calendar parameters are related to the end of previous run (nit000-1) … … 200 213 nsec_year = nsec_year + ndt 201 214 nsec_month = nsec_month + ndt 215 IF( nn_leapy==1 ) nsec_week = nsec_week + ndt 202 216 nsec_day = nsec_day + ndt 203 217 adatrj = adatrj + rdttra(1) / rday … … 228 242 ndastp = nyear * 10000 + nmonth * 100 + nday ! NEW date 229 243 ! 244 !compute first day of the year in julian days 245 CALL ymds2ju( nyear, 01, 01, 0.0, fjulstartyear ) 246 ! 230 247 IF(lwp) WRITE(numout,'(a,i8,a,i4.4,a,i2.2,a,i2.2,a,i3.3)') '======>> time-step =', kt, & 231 248 & ' New day, DATE Y/M/D = ', nyear, '/', nmonth, '/', nday, ' nday_year = ', nday_year 232 249 IF(lwp) WRITE(numout,'(a,i8,a,i7,a,i5)') ' nsec_year = ', nsec_year, & 233 & ' nsec_month = ', nsec_month, ' nsec_day = ', nsec_day 234 ENDIF 250 & ' nsec_month = ', nsec_month, ' nsec_day = ', nsec_day, ' nsec_week = ', nsec_week 251 ENDIF 252 253 IF( nsec_week .GT. 7*86400 ) nsec_week = ndt05 235 254 236 255 IF(ln_ctl) THEN -
branches/DEV_r2106_LOCEAN2010/NEMO/OPA_SRC/DOM/dom_oce.F90
r2148 r2236 9 9 !! NEMO/OPA 3.2 , LOCEAN-IPSL (2009) 10 10 !! $Id$ 11 !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)11 !! Software governed by the CeCILL licence (NEMOGCM/License_CeCILL.txt) 12 12 !!---------------------------------------------------------------------- 13 13 USE par_oce ! ocean parameters … … 197 197 !! calendar variables 198 198 !! --------------------------------------------------------------------- 199 INTEGER , PUBLIC :: nyear !: current year 200 INTEGER , PUBLIC :: nmonth !: current month 201 INTEGER , PUBLIC :: nday !: current day of the month 202 INTEGER , PUBLIC :: ndastp !: time step date in yyyymmdd format 203 INTEGER , PUBLIC :: nday_year !: current day counted from jan 1st of the current year 204 INTEGER , PUBLIC :: nsec_year !: current time step counted in second since 00h jan 1st of the current year 205 INTEGER , PUBLIC :: nsec_month !: current time step counted in second since 00h 1st day of the current month 206 INTEGER , PUBLIC :: nsec_day !: current time step counted in second since 00h of the current day 207 REAL(wp), PUBLIC :: fjulday !: julian day 208 REAL(wp), PUBLIC :: adatrj !: number of elapsed days since the begining of the whole simulation 209 ! !: (cumulative duration of previous runs that may have used different time-step size) 199 INTEGER , PUBLIC :: nyear !: current year 200 INTEGER , PUBLIC :: nmonth !: current month 201 INTEGER , PUBLIC :: nday !: current day of the month 202 INTEGER , PUBLIC :: ndastp !: time step date in yyyymmdd format 203 INTEGER , PUBLIC :: nday_year !: current day counted from jan 1st of the current year 204 INTEGER , PUBLIC :: nsec_year !: current time step counted in second since 00h jan 1st of the current year 205 INTEGER , PUBLIC :: nsec_month !: current time step counted in second since 00h 1st day of the current month 206 INTEGER , PUBLIC :: nsec_week !: current time step counted in second since 00h of last monday 207 INTEGER , PUBLIC :: nsec_day !: current time step counted in second since 00h of the current day 208 REAL(wp), PUBLIC :: fjulday !: current julian day 209 REAL(wp), PUBLIC :: fjulstartyear !: first day of the current year in julian days 210 REAL(wp), PUBLIC :: adatrj !: number of elapsed days since the begining of the whole simulation 211 ! !: (cumulative duration of previous runs that may have used different time-step size) 210 212 INTEGER , PUBLIC, DIMENSION(0: 1) :: nyear_len !: length in days of the previous/current year 211 213 INTEGER , PUBLIC, DIMENSION(0:13) :: nmonth_len !: length in days of the months of the current year … … 230 232 LOGICAL, PUBLIC, PARAMETER :: lk_agrif = .FALSE. !: agrif flag 231 233 234 !!---------------------------------------------------------------------- 235 !! mpp reproducibility 236 !!---------------------------------------------------------------------- 237 #if defined key_mpp_rep1 || defined key_mpp_re2 238 LOGICAL, PUBLIC, PARAMETER :: lk_mpp_rep = .TRUE. !: agrif flag 239 #else 240 LOGICAL, PUBLIC, PARAMETER :: lk_mpp_rep = .FALSE. !: agrif flag 241 #endif 242 232 243 CONTAINS 233 244 LOGICAL FUNCTION Agrif_Root() … … 239 250 END FUNCTION Agrif_CFixed 240 251 #endif 241 242 252 !!====================================================================== 243 253 END MODULE dom_oce -
branches/DEV_r2106_LOCEAN2010/NEMO/OPA_SRC/DOM/domain.F90
r1976 r2236 43 43 !! NEMO/OPA 3.2 , LOCEAN-IPSL (2009) 44 44 !! $Id$ 45 !! Software is governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)45 !! Software is governed by the CeCILL licence (NEMOGCM/License_CeCILL.txt) 46 46 !!------------------------------------------------------------------------- 47 47 -
branches/DEV_r2106_LOCEAN2010/NEMO/OPA_SRC/DOM/domcfg.F90
r1566 r2236 24 24 !! NEMO/OPA 3.2 , LODYC-IPSL (2009) 25 25 !! $Id$ 26 !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)26 !! Software governed by the CeCILL licence (NEMOGCM/License_CeCILL.txt) 27 27 !!---------------------------------------------------------------------- 28 28 -
branches/DEV_r2106_LOCEAN2010/NEMO/OPA_SRC/DOM/domhgr.F90
r1953 r2236 40 40 !! OPA 9.0 , LOCEAN-IPSL (2005) 41 41 !! $Id$ 42 !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)42 !! Software governed by the CeCILL licence (NEMOGCM/License_CeCILL.txt) 43 43 !!---------------------------------------------------------------------- 44 44 -
branches/DEV_r2106_LOCEAN2010/NEMO/OPA_SRC/DOM/dommsk.F90
r1707 r2236 44 44 !! NEMO/OPA 3.2 , LODYC-IPSL (2009) 45 45 !! $Id$ 46 !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)46 !! Software governed by the CeCILL licence (NEMOGCM/License_CeCILL.txt) 47 47 !!---------------------------------------------------------------------- 48 48 -
branches/DEV_r2106_LOCEAN2010/NEMO/OPA_SRC/DOM/domngb.F90
r1725 r2236 21 21 !! NEMO/OPA 3.2 , LOCEAN-IPSL (2008) 22 22 !! $Id$ 23 !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)23 !! Software governed by the CeCILL licence (NEMOGCM/License_CeCILL.txt) 24 24 !!---------------------------------------------------------------------- 25 25 -
branches/DEV_r2106_LOCEAN2010/NEMO/OPA_SRC/DOM/domstp.F90
r1152 r2236 29 29 !! OPA 9.0 , LOCEAN-IPSL (2005) 30 30 !! $Id$ 31 !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)31 !! Software governed by the CeCILL licence (NEMOGCM/License_CeCILL.txt) 32 32 !!---------------------------------------------------------------------- 33 33 -
branches/DEV_r2106_LOCEAN2010/NEMO/OPA_SRC/DOM/domvvl.F90
r2148 r2236 38 38 !! NEMO/OPA 3.2 , LOCEAN-IPSL (2009) 39 39 !! $Id$ 40 !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)40 !! Software governed by the CeCILL licence (NEMOGCM/License_CeCILL.txt) 41 41 !!---------------------------------------------------------------------- 42 42 -
branches/DEV_r2106_LOCEAN2010/NEMO/OPA_SRC/DOM/domzgr.F90
r1694 r2236 34 34 USE lbclnk ! ocean lateral boundary conditions (or mpp link) 35 35 USE closea ! closed seas 36 USE c1d ! 1D configuration37 36 38 37 IMPLICIT NONE … … 59 58 !! NEMO/OPA 3.0 , LOCEAN-IPSL (2008) 60 59 !! $Id$ 61 !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)60 !! Software governed by the CeCILL licence (NEMOGCM/License_CeCILL.txt) 62 61 !!---------------------------------------------------------------------- 63 62 … … 482 481 ! ! =============== ! 483 482 484 ! ! =================== ! 485 IF( .NOT. lk_c1d ) CALL zgr_bat_ctl ! Bathymetry check ! 486 ! ! =================== ! 483 #if ! defined key_c1d 484 ! ! =================== ! 485 CALL zgr_bat_ctl ! Bathymetry check ! 486 ! ! =================== ! 487 #endif 487 488 END SUBROUTINE zgr_bat 488 489 … … 984 985 ! ! =============== ! 985 986 986 ! ! =================== ! 987 IF( .NOT. lk_c1d ) CALL zgr_bat_ctl ! Bathymetry check ! 988 ! ! =================== ! 987 #if ! defined key_c1d 988 ! ! =================== ! 989 CALL zgr_bat_ctl ! Bathymetry check ! 990 ! ! =================== ! 991 #endif 989 992 END SUBROUTINE zgr_zps 990 993 … … 1476 1479 ! ! =========== 1477 1480 1478 ! ! =================== ! 1479 IF( .NOT. lk_c1d ) CALL zgr_bat_ctl ! Bathymetry check ! 1480 ! ! =================== ! 1481 #if ! defined key_c1d 1482 ! ! =================== ! 1483 CALL zgr_bat_ctl ! Bathymetry check ! 1484 ! ! =================== ! 1485 #endif 1481 1486 1482 1487 ! ! ============= -
branches/DEV_r2106_LOCEAN2010/NEMO/OPA_SRC/DOM/domzgr_substitute.h90
r2148 r2236 108 108 !! NEMO/OPA 3.2 , LOCEAN-IPSL (2009) 109 109 !! $Id$ 110 !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)110 !! Software governed by the CeCILL licence (NEMOGCM/License_CeCILL.txt) 111 111 !!---------------------------------------------------------------------- -
branches/DEV_r2106_LOCEAN2010/NEMO/OPA_SRC/DOM/phycst.F90
r2224 r2236 83 83 !! NEMO/OPA 3.2 , LOCEAN-IPSL (2009) 84 84 !! $Id$ 85 !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)85 !! Software governed by the CeCILL licence (NEMOGCM/License_CeCILL.txt) 86 86 !!---------------------------------------------------------------------- 87 87
Note: See TracChangeset
for help on using the changeset viewer.
