Changeset 1229 for trunk/NEMO/OPA_SRC
- Timestamp:
- 2008-12-01T08:04:11+01:00 (16 years ago)
- Location:
- trunk/NEMO/OPA_SRC
- Files:
-
- 6 edited
-
DOM/domain.F90 (modified) (1 diff)
-
IOM/in_out_manager.F90 (modified) (1 diff)
-
TRD/trdmld_rst.F90 (modified) (3 diffs)
-
TRD/trdmod.F90 (modified) (1 diff)
-
TRD/trdmod_oce.F90 (modified) (1 diff)
-
restart.F90 (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/NEMO/OPA_SRC/DOM/domain.F90
r1146 r1229 140 140 !! * Modules used 141 141 USE ioipsl 142 NAMELIST/namrun/ no , cexper , ln_rstart , nrstdt , nit000,&143 & nit end, ndate0 , nleapy , ninist , nstock,&142 NAMELIST/namrun/ no , cexper, cn_ocerst_in, cn_ocerst_out, ln_rstart, nrstdt, & 143 & nit000, nitend, ndate0 , nleapy , ninist , nstock, & 144 144 & nwrite, ln_dimgnnn 145 145 -
trunk/NEMO/OPA_SRC/IOM/in_out_manager.F90
r1146 r1229 25 25 !! namrun namelist parameters 26 26 !!---------------------------------------------------------------------- 27 CHARACTER (len=16) :: cexper = "exp0" !: experiment name used for output filename 28 LOGICAL :: ln_rstart = .FALSE. !: start from (F) rest or (T) a restart file 29 INTEGER :: no = 0 !: job number 30 INTEGER :: nrstdt = 0 !: control of the time step (0, 1 or 2) 31 INTEGER :: nn_rstssh = 0 !: hand made initilization of ssh or not (1/0) 32 INTEGER :: nit000 = 1 !: index of the first time step 33 INTEGER :: nitend = 10 !: index of the last time step 34 INTEGER :: ndate0 = 961115 !: initial calendar date aammjj 35 INTEGER :: nleapy = 0 !: Leap year calendar flag (0/1 or 30) 36 INTEGER :: ninist = 0 !: initial state output flag (0/1) 37 LOGICAL :: ln_dimgnnn = .FALSE. !: type of dimgout. (F): 1 file for all proc 38 !: (T): 1 file per proc 27 CHARACTER(len=16) :: cexper = "exp0" !: experiment name used for output filename 28 CHARACTER(len=32) :: cn_ocerst_in = "restart" !: suffix of ocean restart name (input) 29 CHARACTER(len=32) :: cn_ocerst_out = "restart" !: suffix of ocean restart name (output) 30 LOGICAL :: ln_rstart = .FALSE. !: start from (F) rest or (T) a restart file 31 INTEGER :: no = 0 !: job number 32 INTEGER :: nrstdt = 0 !: control of the time step (0, 1 or 2) 33 INTEGER :: nn_rstssh = 0 !: hand made initilization of ssh or not (1/0) 34 INTEGER :: nit000 = 1 !: index of the first time step 35 INTEGER :: nitend = 10 !: index of the last time step 36 INTEGER :: ndate0 = 961115 !: initial calendar date aammjj 37 INTEGER :: nleapy = 0 !: Leap year calendar flag (0/1 or 30) 38 INTEGER :: ninist = 0 !: initial state output flag (0/1) 39 LOGICAL :: ln_dimgnnn = .FALSE. !: type of dimgout. (F): 1 file for all proc 40 !: (T): 1 file per proc 39 41 !!---------------------------------------------------------------------- 40 42 !! was in restart but moved here because of the OFF line... better solution should be found... -
trunk/NEMO/OPA_SRC/TRD/trdmld_rst.F90
r1152 r1229 21 21 PUBLIC trd_mld_rst_write ! routine called by step.F90 22 22 23 CHARACTER (len=48) :: crestart = 'initial.nc' ! restart file name 24 INTEGER :: nummldw ! logical unit for mld restart 23 INTEGER :: nummldw ! logical unit for mld restart 25 24 26 25 !!--------------------------------------------------------------------------------- … … 55 54 ENDIF 56 55 ! create the file 57 clname = TRIM(cexper)//"_"//TRIM(ADJUSTL(clkt))//"_ restart_mld"56 clname = TRIM(cexper)//"_"//TRIM(ADJUSTL(clkt))//"_"//TRIM(cn_trdrst_out) 58 57 IF(lwp) THEN 59 58 WRITE(numout,*) … … 140 139 ENDIF 141 140 142 CALL iom_open( 'restart_mld', inum, kiolib = jprstlib )141 CALL iom_open( cn_trdrst_in, inum, kiolib = jprstlib ) 143 142 144 143 IF( ln_trdmld_instant ) THEN -
trunk/NEMO/OPA_SRC/TRD/trdmod.F90
r1146 r1229 281 281 USE in_out_manager ! I/O manager 282 282 283 NAMELIST/namtrd/ ntrd, nctls, ln_trdmld_restart, ucf, ln_trdmld_instant283 NAMELIST/namtrd/ ntrd, nctls, cn_trdrst_in, cn_trdrst_out, ln_trdmld_restart, ucf, ln_trdmld_instant 284 284 !!---------------------------------------------------------------------- 285 285 -
trunk/NEMO/OPA_SRC/TRD/trdmod_oce.F90
r1152 r1229 14 14 15 15 !!* Namelist namtrd: diagnostics on dynamics/tracer trends 16 INTEGER , PUBLIC :: ntrd = 10 !: time step frequency dynamics and tracers trends 17 INTEGER , PUBLIC :: nctls = 0 !: control surface type for trends vertical integration 18 REAL(wp), PUBLIC :: ucf = 1. !: unit conversion factor (for netCDF trends outputs) 19 !: =1. (=86400.) for degC/s (degC/day) and psu/s (psu/day) 20 LOGICAL , PUBLIC :: ln_trdmld_instant = .FALSE. !: flag to diagnose inst./mean ML T/S trends 21 LOGICAL , PUBLIC :: ln_trdmld_restart = .FALSE. !: flag to restart mixed-layer diagnostics 16 INTEGER , PUBLIC :: ntrd = 10 !: time step frequency dynamics and tracers trends 17 INTEGER , PUBLIC :: nctls = 0 !: control surface type for trends vertical integration 18 REAL(wp), PUBLIC :: ucf = 1. !: unit conversion factor (for netCDF trends outputs) 19 !: =1. (=86400.) for degC/s (degC/day) and psu/s (psu/day) 20 CHARACTER(len=32) :: cn_trdrst_in = "restart_mld" !: suffix of ocean restart name (input) 21 CHARACTER(len=32) :: cn_trdrst_out = "restart_mld" !: suffix of ocean restart name (output) 22 LOGICAL , PUBLIC :: ln_trdmld_instant = .FALSE. !: flag to diagnose inst./mean ML T/S trends 23 LOGICAL , PUBLIC :: ln_trdmld_restart = .FALSE. !: flag to restart mixed-layer diagnostics 22 24 23 25 !!* Control parameters -
trunk/NEMO/OPA_SRC/restart.F90
r1218 r1229 80 80 ENDIF 81 81 ! create the file 82 clname = TRIM(cexper)//"_"//TRIM(ADJUSTL(clkt))//"_ restart"82 clname = TRIM(cexper)//"_"//TRIM(ADJUSTL(clkt))//"_"//TRIM(cn_ocerst_out) 83 83 IF(lwp) THEN 84 84 WRITE(numout,*) … … 179 179 ENDIF 180 180 181 CALL iom_open( 'restart', numror, kiolib = jprstlib )181 CALL iom_open( cn_ocerst_in, numror, kiolib = jprstlib ) 182 182 183 183 ! Check dynamics and tracer time-step consistency and force Euler restart if changed
Note: See TracChangeset
for help on using the changeset viewer.
