Changeset 7681
- Timestamp:
- 2017-02-14T18:56:01+01:00 (6 years ago)
- Location:
- trunk/NEMOGCM
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/NEMOGCM/ARCH/arch-macport_osx.fcm
r7646 r7681 42 42 %NCDF_HOME /opt/local 43 43 %HDF5_HOME /opt/local 44 ###%XIOS_HOME /Users/$( whoami )/xios-2.0_r966 45 %XIOS_HOME /Users/$( whoami )/xios-1.0 44 %XIOS_HOME /Users/$( whoami )/xios-2.0 46 45 %OASIS_HOME /not/defined 47 46 -
trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/P2Z/p2zopt.F90
r7646 r7681 123 123 DO ji = 1, jpi 124 124 IF( etot(ji,jj,jk) >= zpar100(ji,jj) ) neln(ji,jj) = jk + 1 125 ! ! nb. this is to ensure compatibility with126 ! ! nmld_trc definition in trd_mxl_trc_zint127 125 END DO 128 126 END DO -
trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/P2Z/p2zsms.F90
r7646 r7681 61 61 END IF 62 62 63 IF( lk_trdmxl_trc ) CALL trd_mxl_bio( kt ) ! trends: Mixed-layer64 63 ! 65 64 IF ( lwm .AND. kt == nittrc000 ) CALL FLUSH ( numonp ) ! flush output namelist PISCES -
trunk/NEMOGCM/NEMO/TOP_SRC/TRP/trdtrc.F90
r5836 r7681 22 22 PRIVATE 23 23 24 INTERFACE trd_trc25 MODULE PROCEDURE trd_trc_trp, trd_trc_bio26 END INTERFACE27 28 24 PUBLIC trd_trc 29 25 … … 36 32 CONTAINS 37 33 38 SUBROUTINE trd_trc _trp( ptrtrd, kjn, ktrd, kt )34 SUBROUTINE trd_trc( ptrtrd, kjn, ktrd, kt ) 39 35 !!---------------------------------------------------------------------- 40 36 !! *** ROUTINE trd_trc *** … … 103 99 END IF 104 100 105 END SUBROUTINE trd_trc _trp101 END SUBROUTINE trd_trc 106 102 107 SUBROUTINE trd_trc_bio( ptrbio, ktrd, kt )108 !!----------------------------------------------------------------------109 !! *** ROUTINE trd_bio ***110 !!----------------------------------------------------------------------111 112 INTEGER, INTENT( in ) :: kt ! time step113 INTEGER, INTENT( in ) :: ktrd ! bio trend index114 REAL(wp), DIMENSION(jpi,jpj,jpk), INTENT( inout ) :: ptrbio ! Bio trend115 !!----------------------------------------------------------------------116 117 #if defined key_trdmxl_trc118 CALL trd_mxl_bio_zint( ptrbio, ktrd ) ! Verticaly integrated biological trends119 #endif120 121 END SUBROUTINE trd_trc_bio122 103 #else 123 104 !!---------------------------------------------------------------------- … … 125 106 !!---------------------------------------------------------------------- 126 107 127 INTERFACE trd_trc 128 MODULE PROCEDURE trd_trc_trp, trd_trc_bio 129 END INTERFACE 108 PUBLIC trd_trc 130 109 131 110 CONTAINS 132 111 133 SUBROUTINE trd_trc _trp( ptrtrd, kjn, ktrd, kt )112 SUBROUTINE trd_trc( ptrtrd, kjn, ktrd, kt ) 134 113 INTEGER , INTENT( in ) :: kt ! time step 135 114 INTEGER , INTENT( in ) :: kjn ! tracer index 136 115 INTEGER , INTENT( in ) :: ktrd ! tracer trend index 137 116 REAL, DIMENSION(:,:,:), INTENT( inout ) :: ptrtrd ! Temperature or U trend 138 WRITE(*,*) 'trd_trc _trp: You should not have seen this print! error?', ptrtrd(1,1,1)117 WRITE(*,*) 'trd_trc : You should not have seen this print! error?', ptrtrd(1,1,1) 139 118 WRITE(*,*) ' " " : You should not have seen this print! error?', kjn 140 119 WRITE(*,*) ' " " : You should not have seen this print! error?', ktrd 141 120 WRITE(*,*) ' " " : You should not have seen this print! error?', kt 142 END SUBROUTINE trd_trc_trp 143 144 SUBROUTINE trd_trc_bio( ptrbio, ktrd, kt ) 145 INTEGER , INTENT( in ) :: kt ! time step 146 INTEGER , INTENT( in ) :: ktrd ! tracer trend index 147 REAL, DIMENSION(:,:,:), INTENT( inout ) :: ptrbio ! Temperature or U trend 148 WRITE(*,*) 'trd_trc_trp : You should not have seen this print! error?', ptrbio(1,1,1) 149 WRITE(*,*) ' " " : You should not have seen this print! error?', ktrd 150 WRITE(*,*) ' " " : You should not have seen this print! error?', kt 151 END SUBROUTINE trd_trc_bio 121 END SUBROUTINE trd_trc 152 122 153 123 #endif
Note: See TracChangeset
for help on using the changeset viewer.