Changeset 8130
- Timestamp:
- 2017-06-02T16:17:00+02:00 (8 years ago)
- Location:
- branches/NERC/dev_r5518_NOC_MEDUSA_Stable/NEMOGCM
- Files:
-
- 4 edited
-
CONFIG/SHARED/field_def_bgc.xml (modified) (4 diffs)
-
NEMO/TOP_SRC/CFC/trcini_cfc.F90 (modified) (4 diffs)
-
NEMO/TOP_SRC/CFC/trcsms_cfc.F90 (modified) (6 diffs)
-
NEMO/TOP_SRC/trcini.F90 (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
branches/NERC/dev_r5518_NOC_MEDUSA_Stable/NEMOGCM/CONFIG/SHARED/field_def_bgc.xml
r7516 r8130 107 107 <field id="CFC11" long_name="CFC-11 Concentration" unit="umol/m3" /> 108 108 <field id="CFC11_E3T" long_name="CFC11 * E3T" unit="umol/m2" > CFC11 * e3t </field > 109 <!-- CFC12 : variables available with key_cfc --> 110 <field id="CFC12" long_name="CFC-12 Concentration" unit="umol/m3" /> 111 <field id="CFC12_E3T" long_name="CFC12 * E3T" unit="umol/m2" > CFC12 * e3t </field > 112 <!-- SF6 : variables available with key_cfc --> 113 <field id="SF6" long_name="SF6 Concentration" unit="umol/m3" /> 114 <field id="SF6_E3T" long_name="SF6 * E3T" unit="umol/m2" > SF6 * e3t </field > 109 115 <!-- Bomb C14 : variables available with key_c14b --> 110 116 <field id="C14B" long_name="Bomb C14 Concentration" unit="1" /> … … 227 233 <field id="qtrCFC11" long_name="Air-sea flux of CFC-11" unit="mol/m2/s" /> 228 234 <field id="qintCFC11" long_name="Cumulative air-sea flux of CFC-11" unit="mol/m2" /> 235 <!-- CFC12 : variables available with key_cfc --> 236 <field id="qtrCFC12" long_name="Air-sea flux of CFC-12" unit="mol/m2/s" /> 237 <field id="qintCFC12" long_name="Cumulative air-sea flux of CFC-12" unit="mol/m2" /> 238 <!-- SF6 : variables available with key_cfc --> 239 <field id="qtrSF6" long_name="Air-sea flux of SF6" unit="mol/m2/s" /> 240 <field id="qintSF6" long_name="Cumulative air-sea flux of SF6" unit="mol/m2" /> 229 241 230 242 <!-- Bomb C14 : variables available with key_c14b --> … … 543 555 544 556 <field_group id="groupCFC" > 545 <field field_ref="CFC11" name="CFC11" /> 557 <field field_ref="CFC11" name="CFC11" /> 558 <field field_ref="CFC11_E3T" name="CFC11_E3T" /> 559 <field field_ref="CFC12" name="CFC12" /> 560 <field field_ref="CFC12_E3T" name="CFC12_E3T" /> 561 <field field_ref="SF6" name="SF6" /> 562 <field field_ref="SF6_E3T" name="SF6_E3T" /> 546 563 </field_group> 547 564 … … 549 566 <field field_ref="qtrCFC11" name="qtrCFC11" /> 550 567 <field field_ref="qintCFC11" name="qintCFC11" /> 568 <field field_ref="qtrCFC12" name="qtrCFC12" /> 569 <field field_ref="qintCFC12" name="qintCFC12" /> 570 <field field_ref="qtrSF6" name="qtrSF6" /> 571 <field field_ref="qintSF6" name="qintSF6" /> 551 572 </field_group> 552 573 -
branches/NERC/dev_r5518_NOC_MEDUSA_Stable/NEMOGCM/NEMO/TOP_SRC/CFC/trcini_cfc.F90
r8075 r8130 70 70 ! ! Allocate CFC arrays 71 71 72 ALLOCATE( p_cfc(jpyear,jphem, 2), STAT=ierr )72 ALLOCATE( p_cfc(jpyear,jphem,3), STAT=ierr ) 73 73 IF( ierr > 0 ) THEN 74 74 CALL ctl_stop( 'trc_ini_cfc: unable to allocate p_cfc array' ) ; RETURN … … 91 91 ENDIF 92 92 qint_cfc(:,:,:) = 0._wp 93 DO jl = 1, jp_cfc 94 jn = jp_cfc0 + jl - 1 95 trn(:,:,:,jn) = 0._wp 96 END DO 93 trn(:,:,:,jp_cfc0:jp_cfc1) = 0._wp 97 94 ENDIF 98 95 … … 107 104 DO 108 105 READ(inum,*, IOSTAT=io) zyy, p_cfc(jn,1,1), p_cfc(jn,1,2), & 109 & p_cfc(jn,1,3), p_cfc(jn,2,1) &106 & p_cfc(jn,1,3), p_cfc(jn,2,1), & 110 107 & p_cfc(jn,2,2), p_cfc(jn,2,3) 111 108 IF( io < 0 ) exit … … 128 125 DO jn = 30, jpyear 129 126 WRITE(numout, '( 1I4, 6F9.2)') jn, p_cfc(jn,1,1), p_cfc(jn,2,1), & 130 & p_cfc(jn,1,2), p_cfc(jn,2,2) &127 & p_cfc(jn,1,2), p_cfc(jn,2,2), & 131 128 & p_cfc(jn,1,3), p_cfc(jn,2,3) 132 129 END DO -
branches/NERC/dev_r5518_NOC_MEDUSA_Stable/NEMOGCM/NEMO/TOP_SRC/CFC/trcsms_cfc.F90
r8075 r8130 136 136 !! 2 -- Hindcast/proj 137 137 iyear_beg = MOD(nyear, 100) 138 IF (iyear_beg < 9) iyear_beg = iyear_beg + 100138 IF (iyear_beg < 20) iyear_beg = iyear_beg + 100 139 139 !! JPALM -- Same than previously, if iyear_beg is out of P_cfc range, 140 140 !! we want to set p_CFC to 0.00 --> set iyear_beg = 10 141 IF ((iyear_beg < 30) .OR. (iyear_beg > 1 07)) iyear_beg = 10141 IF ((iyear_beg < 30) .OR. (iyear_beg > 115)) iyear_beg = 10 142 142 ENDIF 143 143 !! … … 258 258 ! 259 259 IF( lk_iomput ) THEN 260 CALL iom_put( "qtrCFC11" , qtr_cfc (:,:,1) )261 CALL iom_put( "qintCFC11" , qint_cfc(:,:,1) )262 CALL iom_put( "qtrCFC12" , qtr_cfc (:,:,2) )263 CALL iom_put( "qintCFC12" , qint_cfc(:,:,2) )264 CALL iom_put( "qtrSF6" , qtr_cfc (:,:,3) )265 CALL iom_put( "qintSF6" , qint_cfc(:,:,4) )260 IF (iom_use("qtrCFC11")) CALL iom_put( "qtrCFC11" , qtr_cfc (:,:,1) ) 261 IF (iom_use("qintCFC11")) CALL iom_put( "qintCFC11" , qint_cfc(:,:,1) ) 262 IF (iom_use("qtrCFC12")) CALL iom_put( "qtrCFC12" , qtr_cfc (:,:,2) ) 263 IF (iom_use("qintCFC12")) CALL iom_put( "qintCFC12" , qint_cfc(:,:,2) ) 264 IF (iom_use("qtrSF6")) CALL iom_put( "qtrSF6" , qtr_cfc (:,:,3) ) 265 IF (iom_use("qintSF6")) CALL iom_put( "qintSF6" , qint_cfc(:,:,3) ) 266 266 ELSE 267 267 IF( ln_diatrc ) THEN … … 271 271 trc2d(:,:,jp_cfc0_2d + 3) = qint_cfc(:,:,2) 272 272 trc2d(:,:,jp_cfc0_2d + 4) = qtr_cfc (:,:,3) 273 trc2d(:,:,jp_cfc0_2d + 5) = qint_cfc(:,:, 4)273 trc2d(:,:,jp_cfc0_2d + 5) = qint_cfc(:,:,3) 274 274 END IF 275 275 END IF … … 376 376 qtr_cfc(:,:,:) = 0._wp 377 377 qint_cfc(:,:,:) = 0._wp 378 DO jl = 1, jp_cfc 379 jn = jp_cfc0 + jl - 1 380 trn(:,:,:,jn) = 0._wp 381 trb(:,:,:,jn) = 0._wp 382 END DO 378 trn(:,:,:,jp_cfc0:jp_cfc1) = 0._wp 379 trb(:,:,:,jp_cfc0:jp_cfc1) = 0._wp 383 380 ENDIF 384 381 !! … … 386 383 ELSEIF (simu_type==2) THEN 387 384 iyear_beg = MOD(nyear, 100) 388 IF (iyear_beg < 9) iyear_beg = iyear_beg + 100389 IF ((iyear_beg < 30) .OR. (iyear_beg > 1 07)) THEN385 IF (iyear_beg < 20) iyear_beg = iyear_beg + 100 386 IF ((iyear_beg < 30) .OR. (iyear_beg > 115)) THEN 390 387 qtr_cfc(:,:,:) = 0._wp 391 388 IF(lwp) THEN … … 398 395 qtr_cfc(:,:,:) = 0._wp 399 396 qint_cfc(:,:,:) = 0._wp 400 DO jl = 1, jp_cfc 401 jn = jp_cfc0 + jl - 1 402 trn(:,:,:,jn) = 0._wp 403 trb(:,:,:,jn) = 0._wp 404 END DO 397 trn(:,:,:,jp_cfc0:jp_cfc1) = 0._wp 398 trb(:,:,:,jp_cfc0:jp_cfc1) = 0._wp 405 399 ENDIF 406 400 ENDIF -
branches/NERC/dev_r5518_NOC_MEDUSA_Stable/NEMOGCM/NEMO/TOP_SRC/trcini.F90
r7709 r8130 163 163 ELSE 164 164 ! 165 # if defined key_debug_medusa 166 IF (lwp) write (numout,*) '------------------------------' 167 IF (lwp) write (numout,*) 'Jpalm - debug' 168 IF (lwp) write (numout,*) ' Init from file -- will call trc_dta' 169 IF (lwp) write (numout,*) ' ' 170 CALL flush(numout) 171 # endif 172 ! 165 173 IF( ln_trcdta .AND. nb_trcdta > 0 ) THEN ! Initialisation of tracer from a file that may also be used for damping 166 174 !
Note: See TracChangeset
for help on using the changeset viewer.
