Changeset 8557 for branches/NERC
- Timestamp:
- 2017-09-22T13:06:31+02:00 (7 years ago)
- Location:
- branches/NERC/dev_r5518_GO6_package_trdtrc/NEMOGCM
- Files:
-
- 2 edited
-
CONFIG/SHARED/field_def_bgc.xml (modified) (8 diffs)
-
NEMO/TOP_SRC/TRP/trcsbc.F90 (modified) (5 diffs)
Legend:
- Unmodified
- Added
- Removed
-
branches/NERC/dev_r5518_GO6_package_trdtrc/NEMOGCM/CONFIG/SHARED/field_def_bgc.xml
r8535 r8557 1287 1287 <field field_ref="ZDP_ALK" name="ZDP_ALK" /> 1288 1288 <field field_ref="ZDP_OXY" name="ZDP_OXY" /> 1289 <!-- trd case: jptra_dmp --> 1289 <!-- trd case: jptra_dmp --> 1290 <!-- NO DAMPING IN MEDUSA - COMMENT DO AVOID NaN 1290 1291 <field field_ref="DMP_CHN" name="DMP_CHN" /> 1291 1292 <field field_ref="DMP_CHD" name="DMP_CHD" /> … … 1302 1303 <field field_ref="DMP_DiC" name="DMP_DiC" /> 1303 1304 <field field_ref="DMP_ALK" name="DMP_ALK" /> 1304 <field field_ref="DMP_OXY" name="DMP_OXY" /> 1305 <field field_ref="DMP_OXY" name="DMP_OXY" /> --> 1305 1306 <!-- trd case: jptra_sms --> 1306 1307 <field field_ref="SMS_CHN" name="SMS_CHN" /> … … 1413 1414 <field field_ref="ZDF_CFC11" name="ZDF_CFC11" standard_name="CFC-11_Concentration" /> 1414 1415 <field field_ref="ZDP_CFC11" name="ZDP_CFC11" standard_name="CFC-11_Concentration" /> 1415 < field field_ref="DMP_CFC11" name="DMP_CFC11" standard_name="CFC-11_Concentration" />1416 <!-- <field field_ref="DMP_CFC11" name="DMP_CFC11" standard_name="CFC-11_Concentration" /> --> 1416 1417 <field field_ref="SMS_CFC11" name="SMS_CFC11" standard_name="CFC-11_Concentration" /> 1417 1418 <field field_ref="SMS_CFC11_INV" name="SMS_CFC11_INV" standard_name="CFC-11_Concentration" /> … … 1434 1435 <field field_ref="ZDF_CFC12" name="ZDF_CFC12" standard_name="CFC-12_Concentration" /> 1435 1436 <field field_ref="ZDP_CFC12" name="ZDP_CFC12" standard_name="CFC-12_Concentration" /> 1436 < field field_ref="DMP_CFC12" name="DMP_CFC12" standard_name="CFC-12_Concentration" />1437 <!-- <field field_ref="DMP_CFC12" name="DMP_CFC12" standard_name="CFC-12_Concentration" /> --> 1437 1438 <field field_ref="SMS_CFC12" name="SMS_CFC12" standard_name="CFC-12_Concentration" /> 1438 1439 <field field_ref="SMS_CFC12_INV" name="SMS_CFC12_INV" standard_name="CFC-12_Concentration" /> … … 1455 1456 <field field_ref="ZDF_SF6" name="ZDF_SF6" standard_name="SF6_Concentration" /> 1456 1457 <field field_ref="ZDP_SF6" name="ZDP_SF6" standard_name="SF6_Concentration" /> 1457 < field field_ref="DMP_SF6" name="DMP_SF6" standard_name="SF6_Concentration" />1458 <!-- <field field_ref="DMP_SF6" name="DMP_SF6" standard_name="SF6_Concentration" /> --> 1458 1459 <field field_ref="SMS_SF6" name="SMS_SF6" standard_name="SF6_Concentration" /> 1459 1460 <field field_ref="SMS_SF6_INV" name="SMS_SF6_INV" standard_name="SF6_Concentration" /> … … 1476 1477 <field field_ref="ZDF_Age" name="ZDF_Age" standard_name="sea_water_age_since_surface_contact" /> 1477 1478 <field field_ref="ZDP_Age" name="ZDP_Age" standard_name="sea_water_age_since_surface_contact" /> 1478 < field field_ref="DMP_Age" name="DMP_Age" standard_name="sea_water_age_since_surface_contact" />1479 <!-- <field field_ref="DMP_Age" name="DMP_Age" standard_name="sea_water_age_since_surface_contact" /> --> 1479 1480 <field field_ref="SMS_Age" name="SMS_Age" standard_name="sea_water_age_since_surface_contact" /> 1480 1481 <field field_ref="SMS_Age_INV" name="SMS_Age_INV" standard_name="sea_water_age_since_surface_contact" /> … … 1497 1498 <field field_ref="ZDF_IDTRA" name="ZDF_IDTRA" standard_name="IDTRA_Concentration" /> 1498 1499 <field field_ref="ZDP_IDTRA" name="ZDP_IDTRA" standard_name="IDTRA_Concentration" /> 1499 < field field_ref="DMP_IDTRA" name="DMP_IDTRA" standard_name="IDTRA_Concentration" />1500 <!-- <field field_ref="DMP_IDTRA" name="DMP_IDTRA" standard_name="IDTRA_Concentration" /> --> 1500 1501 <field field_ref="SMS_IDTRA" name="SMS_IDTRA" standard_name="IDTRA_Concentration" /> 1501 1502 <field field_ref="SMS_IDTRA_INV" name="SMS_IDTRA_INV" standard_name="IDTRA_Concentration" /> … … 1518 1519 <field field_ref="ZDF_C14B" name="ZDF_C14B" standard_name="C14b_Concentration" /> 1519 1520 <field field_ref="ZDP_C14B" name="ZDP_C14B" standard_name="C14b_Concentration" /> 1520 < field field_ref="DMP_C14B" name="DMP_C14B" standard_name="C14b_Concentration" />1521 <!-- <field field_ref="DMP_C14B" name="DMP_C14B" standard_name="C14b_Concentration" /> --> 1521 1522 <field field_ref="SMS_C14B" name="SMS_C14B" standard_name="C14b_Concentration" /> 1522 1523 <field field_ref="SMS_C14B_INV" name="SMS_C14B_INV" standard_name="C14b_Concentration" /> -
branches/NERC/dev_r5518_GO6_package_trdtrc/NEMOGCM/NEMO/TOP_SRC/TRP/trcsbc.F90
r8356 r8557 68 68 CHARACTER (len=22) :: charout 69 69 REAL(wp), POINTER, DIMENSION(:,: ) :: zsfx 70 REAL(wp), POINTER, DIMENSION(:,: ,:) :: ztrtrd70 REAL(wp), POINTER, DIMENSION(:,: ) :: ztrtrd 71 71 72 72 !!--------------------------------------------------------------------- … … 76 76 ! Allocate temporary workspace 77 77 CALL wrk_alloc( jpi, jpj, zsfx ) 78 IF( l_trdtrc ) CALL wrk_alloc( jpi, jpj, jpk,ztrtrd )78 IF( l_trdtrc ) CALL wrk_alloc( jpi, jpj, ztrtrd ) 79 79 ! 80 80 zrtrn = 1.e-15_wp … … 140 140 DO jn = 1, jptra 141 141 ! 142 IF( l_trdtrc ) ztrtrd(:,: ,:) = tra(:,:,:,jn) ! save trends142 IF( l_trdtrc ) ztrtrd(:,:) = tra(:,:,1,jn) ! save trends 143 143 ! ! add the trend to the general tracer trend 144 144 … … 184 184 ! 185 185 IF( l_trdtrc ) THEN 186 ztrtrd(:,: ,:) = tra(:,:,:,jn) - ztrtrd(:,:,:)186 ztrtrd(:,:) = tra(:,:,1,jn) - ztrtrd(:,:) 187 187 CALL trd_tra( kt, 'TRC', jn, jptra_nsr, ztrtrd ) 188 188 END IF … … 207 207 CALL prt_ctl_trc( tab4d=tra, mask=tmask, clinfo=ctrcnm, clinfo2='trd' ) 208 208 ENDIF 209 CALL wrk_dealloc( jpi, jpj, 210 IF( l_trdtrc ) CALL wrk_dealloc( jpi, jpj, jpk,ztrtrd )209 CALL wrk_dealloc( jpi, jpj, zsfx ) 210 IF( l_trdtrc ) CALL wrk_dealloc( jpi, jpj, ztrtrd ) 211 211 ! 212 212 IF( nn_timing == 1 ) CALL timing_stop('trc_sbc')
Note: See TracChangeset
for help on using the changeset viewer.
