Changeset 114 for trunk/NEMO/OPA_SRC
- Timestamp:
- 2004-06-28T16:49:05+02:00 (20 years ago)
- Location:
- trunk/NEMO/OPA_SRC
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/NEMO/OPA_SRC/DTA/dtasal.F90
r59 r114 134 134 STOP 'dta_sal' 135 135 ENDIF 136 IF( ipi /= jpidta . AND. ipj /= jpjdta .AND. ipk /= jpk ) THEN136 IF( ipi /= jpidta .OR. ipj /= jpjdta .OR. ipk /= jpk ) THEN 137 137 IF(lwp) THEN 138 138 WRITE(numout,*) … … 269 269 WRITE(numout,*)' salinity Levitus month ',nsal1,nsal2 270 270 WRITE(numout,*) 271 WRITE(numout,*) ' Levitus mo unth = ',nsal1,' level = 1'271 WRITE(numout,*) ' Levitus month = ',nsal1,' level = 1' 272 272 CALL prihre(saldta(1,1,1,1),jpi,jpj,1,jpi,20,1,jpj,20,1.,numout) 273 WRITE(numout,*) ' Levitus mo unth = ',nsal1,' level = ',jpk/2273 WRITE(numout,*) ' Levitus month = ',nsal1,' level = ',jpk/2 274 274 CALL prihre(saldta(1,1,jpk/2,1),jpi,jpj,1,jpi,20,1,jpj,20,1.,numout) 275 WRITE(numout,*) ' Levitus mo unth = ',nsal1,' level = ',jpkm1275 WRITE(numout,*) ' Levitus month = ',nsal1,' level = ',jpkm1 276 276 CALL prihre(saldta(1,1,jpkm1,1),jpi,jpj,1,jpi,20,1,jpj,20,1.,numout) 277 277 ENDIF -
trunk/NEMO/OPA_SRC/DTA/dtatem.F90
r42 r114 29 29 !! * Module variables 30 30 CHARACTER (len=38) :: & 31 cl_tdata = 'data_1m_pot iential_temperature_nomask '31 cl_tdata = 'data_1m_potential_temperature_nomask ' 32 32 INTEGER :: & 33 33 nlecte = 0, & ! switch for the first read … … 141 141 STOP 'dtatem' 142 142 ENDIF 143 IF( ipi /= jpidta . AND. ipj /= jpjdta .AND. ipk /= jpk ) THEN143 IF( ipi /= jpidta .OR. ipj /= jpjdta .OR. ipk /= jpk ) THEN 144 144 IF(lwp) THEN 145 145 WRITE(numout,*) -
trunk/NEMO/OPA_SRC/SBC/flxrnf.F90
r73 r114 127 127 CASE ( 1 ) 128 128 IF(lwp) WRITE(numout,*) 129 IF(lwp) WRITE(numout,*) 'flx_rnf : monthly runoff (nrunoff= 0)'129 IF(lwp) WRITE(numout,*) 'flx_rnf : monthly runoff (nrunoff=1)' 130 130 IF(lwp) WRITE(numout,*) '~~~~~~~' 131 131 -
trunk/NEMO/OPA_SRC/SBC/tau_forced_daily.h90
r3 r114 101 101 nstop = nstop + 1 102 102 ENDIF 103 IF( ipi /= jpidta . AND. ipj /= jpjdta .AND. ipk /= 1) THEN103 IF( ipi /= jpidta .OR. ipj /= jpjdta ) THEN 104 104 IF(lwp) WRITE(numout,cform_err) 105 105 IF(lwp) WRITE(numout,*) ' problem with size read in file ', cl_taux 106 106 IF(lwp) WRITE(numout,*) ' ipi = ',ipi,' jpidta = ',jpidta 107 107 IF(lwp) WRITE(numout,*) ' ipj = ',ipj,' jpjdta = ',jpjdta 108 IF(lwp) WRITE(numout,*) ' ipk = ',ipk,' must be 1'109 108 nstop = nstop + 1 110 109 ENDIF … … 121 120 nstop = nstop + 1 122 121 ENDIF 123 IF( ipi /= jpidta . AND. ipj /= jpjdta .AND. ipk /= 1) THEN122 IF( ipi /= jpidta .OR. ipj /= jpjdta ) THEN 124 123 IF(lwp) WRITE(numout,cform_err) 125 124 IF(lwp) WRITE(numout,*) ' problem with size read in file ', cl_tauy 126 125 IF(lwp) WRITE(numout,*) ' ipi = ',ipi,' jpidta = ',jpidta 127 126 IF(lwp) WRITE(numout,*) ' ipj = ',ipj,' jpjdta = ',jpjdta 128 IF(lwp) WRITE(numout,*) ' ipk = ',ipk,' must be 1'129 127 nstop = nstop + 1 130 128 ENDIF
Note: See TracChangeset
for help on using the changeset viewer.