Changeset 8463
- Timestamp:
- 2017-08-24T19:05:09+02:00 (6 years ago)
- Location:
- branches/NERC/dev_r5518_GO6_package_trdtrc/NEMOGCM
- Files:
-
- 7 edited
-
CONFIG/SHARED/field_def_bgc.xml (modified) (4 diffs)
-
CONFIG/SHARED/namelist_top_MEDUSA_et_al_ref (modified) (1 diff)
-
CONFIG/SHARED/namelist_top_ref (modified) (1 diff)
-
NEMO/TOP_SRC/CFC/trcsms_cfc.F90 (modified) (3 diffs)
-
NEMO/TOP_SRC/MEDUSA/bio_medusa_update.F90 (modified) (5 diffs)
-
NEMO/TOP_SRC/MEDUSA/trcsms_medusa.F90 (modified) (3 diffs)
-
NEMO/TOP_SRC/trcnam.F90 (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
branches/NERC/dev_r5518_GO6_package_trdtrc/NEMOGCM/CONFIG/SHARED/field_def_bgc.xml
r8453 r8463 523 523 524 524 525 <field_group id=" trdtrc_T" grid_ref="grid_T_3D"> <!-- key_trdtrc || key_trdmlx_trc -->525 <field_group id="ptrd_T" grid_ref="grid_T_3D"> <!-- key_trdtrc || key_trdmlx_trc --> 526 526 <!-- MEDUSA : variables available with key_medusa --> 527 527 <!-- trd case: jptra_xad --> … … 673 673 <field id="ZDP_PHN" long_name="non-diatom phytoplankton" unit="mmol-N/m3/s" /> 674 674 <field id="ZDP_PHD" long_name="diatom phytoplankton" unit="mmol-N/m3/s" /> 675 <field id="ZD F_ZMI" long_name="micro zooplankton" unit="mmol-N/m3/s" />675 <field id="ZDP_ZMI" long_name="micro zooplankton" unit="mmol-N/m3/s" /> 676 676 <field id="ZDP_ZME" long_name="meso zooplankton" unit="mmol-N/m3/s" /> 677 677 <field id="ZDP_DIN" long_name="dissolved inorganic nitrogen" unit="mmol-N/m3/s" /> … … 1187 1187 <field field_ref="ZDP_PHN" name="ZDP_PHN" /> 1188 1188 <field field_ref="ZDP_PHD" name="ZDP_PHD" /> 1189 <field field_ref="ZD F_ZMI" name="ZDF_ZMI" />1189 <field field_ref="ZDP_ZMI" name="ZDP_ZMI" /> 1190 1190 <field field_ref="ZDP_ZME" name="ZDP_ZME" /> 1191 1191 <field field_ref="ZDP_DIN" name="ZDP_DIN" /> … … 1435 1435 </field_group> 1436 1436 1437 1438 <field_group id="trendMEDUSA_short" > 1439 <!-- trd case: jptra_totad --> 1440 <field field_ref="TAD_CHN" name="TAD_CHN" /> 1441 <field field_ref="TAD_CHN_E3T" name="TAD_CHN_E3T" /> 1442 <field field_ref="TAD_CHD" name="TAD_CHD" /> 1443 <field field_ref="TAD_CHD_E3T" name="TAD_CHD_E3T" /> 1444 <field field_ref="TAD_PHN" name="TAD_PHN" /> 1445 <field field_ref="TAD_PHN_E3T" name="TAD_PHN_E3T" /> 1446 <field field_ref="TAD_PHD" name="TAD_PHD" /> 1447 <field field_ref="TAD_PHD_E3T" name="TAD_PHD_E3T" /> 1448 <field field_ref="TAD_ZMI" name="TAD_ZMI" /> 1449 <field field_ref="TAD_ZMI_E3T" name="TAD_ZMI_E3T" /> 1450 <field field_ref="TAD_ZME" name="TAD_ZME" /> 1451 <field field_ref="TAD_ZME_E3T" name="TAD_ZME_E3T" /> 1452 <field field_ref="TAD_DIN" name="TAD_DIN" /> 1453 <field field_ref="TAD_DIN_E3T" name="TAD_DIN_E3T" /> 1454 <field field_ref="TAD_SIL" name="TAD_SIL" /> 1455 <field field_ref="TAD_SIL_E3T" name="TAD_SIL_E3T" /> 1456 <field field_ref="TAD_FER" name="TAD_FER" /> 1457 <field field_ref="TAD_FER_E3T" name="TAD_FER_E3T" /> 1458 <field field_ref="TAD_DET" name="TAD_DET" /> 1459 <field field_ref="TAD_DET_E3T" name="TAD_DET_E3T" /> 1460 <field field_ref="TAD_PDS" name="TAD_PDS" /> 1461 <field field_ref="TAD_PDS_E3T" name="TAD_PDS_E3T" /> 1462 <field field_ref="TAD_DTC" name="TAD_DTC" /> 1463 <field field_ref="TAD_DTC_E3T" name="TAD_DTC_E3T" /> 1464 <field field_ref="TAD_DiC" name="TAD_DiC" /> 1465 <field field_ref="TAD_DiC_E3T" name="TAD_DiC_E3T" /> 1466 <field field_ref="TAD_ALK" name="TAD_ALK" /> 1467 <field field_ref="TAD_ALK_E3T" name="TAD_ALK_E3T" /> 1468 <field field_ref="TAD_OXY" name="TAD_OXY" /> 1469 <field field_ref="TAD_OXY_E3T" name="TAD_OXY_E3T" /> 1470 <!-- trd case: jptra_sms --> 1471 <field field_ref="SMS_CHN" name="SMS_CHN" /> 1472 <field field_ref="SMS_CHN_E3T" name="SMS_CHN_E3T" /> 1473 <field field_ref="SMS_CHD" name="SMS_CHD" /> 1474 <field field_ref="SMS_CHD_E3T" name="SMS_CHD_E3T" /> 1475 <field field_ref="SMS_PHN" name="SMS_PHN" /> 1476 <field field_ref="SMS_PHN_E3T" name="SMS_PHN_E3T" /> 1477 <field field_ref="SMS_PHD" name="SMS_PHD" /> 1478 <field field_ref="SMS_PHD_E3T" name="SMS_PHD_E3T" /> 1479 <field field_ref="SMS_ZMI" name="SMS_ZMI" /> 1480 <field field_ref="SMS_ZMI_E3T" name="SMS_ZMI_E3T" /> 1481 <field field_ref="SMS_ZME" name="SMS_ZME" /> 1482 <field field_ref="SMS_ZME_E3T" name="SMS_ZME_E3T" /> 1483 <field field_ref="SMS_DIN" name="SMS_DIN" /> 1484 <field field_ref="SMS_DIN_E3T" name="SMS_DIN_E3T" /> 1485 <field field_ref="SMS_SIL" name="SMS_SIL" /> 1486 <field field_ref="SMS_SIL_E3T" name="SMS_SIL_E3T" /> 1487 <field field_ref="SMS_FER" name="SMS_FER" /> 1488 <field field_ref="SMS_FER_E3T" name="SMS_FER_E3T" /> 1489 <field field_ref="SMS_DET" name="SMS_DET" /> 1490 <field field_ref="SMS_DET_E3T" name="SMS_DET_E3T" /> 1491 <field field_ref="SMS_PDS" name="SMS_PDS" /> 1492 <field field_ref="SMS_PDS_E3T" name="SMS_PDS_E3T" /> 1493 <field field_ref="SMS_DTC" name="SMS_DTC" /> 1494 <field field_ref="SMS_DTC_E3T" name="SMS_DTC_E3T" /> 1495 <field field_ref="SMS_DiC" name="SMS_DiC" /> 1496 <field field_ref="SMS_DiC_E3T" name="SMS_DiC_E3T" /> 1497 <field field_ref="SMS_ALK" name="SMS_ALK" /> 1498 <field field_ref="SMS_ALK_E3T" name="SMS_ALK_E3T" /> 1499 <field field_ref="SMS_OXY" name="SMS_OXY" /> 1500 <field field_ref="SMS_OXY_E3T" name="SMS_OXY_E3T" /> 1501 <!-- trd case: jptra_tot --> 1502 <field field_ref="TOT_CHN" name="TOT_CHN" /> 1503 <field field_ref="TOT_CHN_E3T" name="TOT_CHN_E3T" /> 1504 <field field_ref="TOT_CHD" name="TOT_CHD" /> 1505 <field field_ref="TOT_CHD_E3T" name="TOT_CHD_E3T" /> 1506 <field field_ref="TOT_PHN" name="TOT_PHN" /> 1507 <field field_ref="TOT_PHN_E3T" name="TOT_PHN_E3T" /> 1508 <field field_ref="TOT_PHD" name="TOT_PHD" /> 1509 <field field_ref="TOT_PHD_E3T" name="TOT_PHD_E3T" /> 1510 <field field_ref="TOT_ZMI" name="TOT_ZMI" /> 1511 <field field_ref="TOT_ZME" name="TOT_ZME" /> 1512 <field field_ref="TOT_ZME_E3T" name="TOT_ZME_E3T" /> 1513 <field field_ref="TOT_DIN" name="TOT_DIN" /> 1514 <field field_ref="TOT_DIN_E3T" name="TOT_DIN_E3T" /> 1515 <field field_ref="TOT_SIL" name="TOT_SIL" /> 1516 <field field_ref="TOT_SIL_E3T" name="TOT_SIL_E3T" /> 1517 <field field_ref="TOT_FER" name="TOT_FER" /> 1518 <field field_ref="TOT_FER_E3T" name="TOT_FER_E3T" /> 1519 <field field_ref="TOT_DET" name="TOT_DET" /> 1520 <field field_ref="TOT_DET_E3T" name="TOT_DET_E3T" /> 1521 <field field_ref="TOT_PDS" name="TOT_PDS" /> 1522 <field field_ref="TOT_PDS_E3T" name="TOT_PDS_E3T" /> 1523 <field field_ref="TOT_DTC" name="TOT_DTC" /> 1524 <field field_ref="TOT_DTC_E3T" name="TOT_DTC_E3T" /> 1525 <field field_ref="TOT_DiC" name="TOT_DiC" /> 1526 <field field_ref="TOT_DiC_E3T" name="TOT_DiC_E3T" /> 1527 <field field_ref="TOT_ALK" name="TOT_ALK" /> 1528 <field field_ref="TOT_ALK_E3T" name="TOT_ALK_E3T" /> 1529 <field field_ref="TOT_OXY" name="TOT_OXY" /> 1530 <field field_ref="TOT_OXY_E3T" name="TOT_OXY_E3T" /> 1531 </field_group> 1532 1533 <field_group id="trendCFC11_short" > 1534 <!-- cfc11 --> 1535 <field field_ref="TOT_CFC11" name="TOT_CFC11" standard_name="CFC-11_Concentration" /> 1536 <field field_ref="TOT_CFC11_E3T" name="TOT_CFC11_E3T" standard_name="CFC-11_Concentration" /> 1537 <field field_ref="TAD_CFC11" name="TAD_CFC11" standard_name="CFC-11_Concentration" /> 1538 <field field_ref="TAD_CFC11_E3T" name="TAD_CFC11_E3T" standard_name="CFC-11_Concentration" /> 1539 <field field_ref="SMS_CFC11" name="SMS_CFC11" standard_name="CFC-11_Concentration" /> 1540 <field field_ref="SMS_CFC11_E3T" name="SMS_CFC11_E3T" standard_name="CFC-11_Concentration" /> 1541 </field_group> 1542 1543 <field_group id="trendCFC12_short" > 1544 <!-- cfc12 --> 1545 <field field_ref="TOT_CFC12" name="TOT_CFC12" standard_name="CFC-12_Concentration" /> 1546 <field field_ref="TOT_CFC12_E3T" name="TOT_CFC12_E3T" standard_name="CFC-12_Concentration" /> 1547 <field field_ref="TAD_CFC12" name="TAD_CFC12" standard_name="CFC-12_Concentration" /> 1548 <field field_ref="TAD_CFC12_E3T" name="TAD_CFC12_E3T" standard_name="CFC-12_Concentration" /> 1549 <field field_ref="SMS_CFC12" name="SMS_CFC12" standard_name="CFC-12_Concentration" /> 1550 <field field_ref="SMS_CFC12_E3T" name="SMS_CFC12_E3T" standard_name="CFC-12_Concentration" /> 1551 </field_group> 1552 1553 <field_group id="trendSF6_short" > 1554 <!-- sf6 --> 1555 <field field_ref="TOT_SF6" name="TOT_SF6" standard_name="SF6_Concentration" /> 1556 <field field_ref="TOT_SF6_E3T" name="TOT_SF6_E3T" standard_name="SF6_Concentration" /> 1557 <field field_ref="TAD_SF6" name="TAD_SF6" standard_name="SF6_Concentration" /> 1558 <field field_ref="TAD_SF6_E3T" name="TAD_SF6_E3T" standard_name="SF6_Concentration" /> 1559 <field field_ref="SMS_SF6" name="SMS_SF6" standard_name="SF6_Concentration" /> 1560 <field field_ref="SMS_SF6_E3T" name="SMS_SF6_E3T" standard_name="SF6_Concentration" /> 1561 </field_group> 1562 1563 <field_group id="trendAGE_short" > 1564 <!-- age --> 1565 <field field_ref="TOT_Age" name="TOT_Age" standard_name="sea_water_age_since_surface_contact" /> 1566 <field field_ref="TOT_Age_E3T" name="TOT_Age_E3T" standard_name="sea_water_age_since_surface_contact" /> 1567 <field field_ref="TAD_Age" name="TAD_Age" standard_name="sea_water_age_since_surface_contact" /> 1568 <field field_ref="TAD_Age_E3T" name="TAD_Age_E3T" standard_name="sea_water_age_since_surface_contact" /> 1569 <field field_ref="SMS_Age" name="SMS_Age" standard_name="sea_water_age_since_surface_contact" /> 1570 <field field_ref="SMS_Age_E3T" name="SMS_Age_E3T" standard_name="sea_water_age_since_surface_contact" /> 1571 </field_group> 1572 1573 <field_group id="trendIDTRA_short" > 1574 <!-- Ideal tracer --> 1575 <field field_ref="TOT_IDTRA" name="TOT_IDTRA" standard_name="IDTRA_Concentration" /> 1576 <field field_ref="TOT_IDTRA_E3T" name="TOT_IDTRA_E3T" standard_name="IDTRA_Concentration" /> 1577 <field field_ref="TAD_IDTRA" name="TAD_IDTRA" standard_name="IDTRA_Concentration" /> 1578 <field field_ref="TAD_IDTRA_E3T" name="TAD_IDTRA_E3T" standard_name="IDTRA_Concentration" /> 1579 <field field_ref="SMS_IDTRA" name="SMS_IDTRA" standard_name="IDTRA_Concentration" /> 1580 <field field_ref="SMS_IDTRA_E3T" name="SMS_IDTRA_E3T" standard_name="IDTRA_Concentration" /> 1581 </field_group> 1582 1583 <field_group id="trendC14B_short" > 1584 <!-- c14 bomb --> 1585 <field field_ref="TOT_C14B" name="TOT_C14B" standard_name="C14b_Concentration" /> 1586 <field field_ref="TOT_C14B_E3T" name="TOT_C14B_E3T" standard_name="C14b_Concentration" /> 1587 <field field_ref="TAD_C14B" name="TAD_C14B" standard_name="C14b_Concentration" /> 1588 <field field_ref="TAD_C14B_E3T" name="TAD_C14B_E3T" standard_name="C14b_Concentration" /> 1589 <field field_ref="SMS_C14B" name="SMS_C14B" standard_name="C14b_Concentration" /> 1590 <field field_ref="SMS_C14B_E3T" name="SMS_C14B_E3T" standard_name="C14b_Concentration" /> 1591 </field_group> 1437 1592 1438 1593 <field_group id="groupMEDUSA_dia" > -
branches/NERC/dev_r5518_GO6_package_trdtrc/NEMOGCM/CONFIG/SHARED/namelist_top_MEDUSA_et_al_ref
r8427 r8463 98 98 nn_ctls_trc = 0 ! control surface type in mixed-layer trends (0,1 or n<jpk) 99 99 rn_ucf_trc = 1 ! unit conversion factor (=1 -> /seconds ; =86400. -> /day) 100 ln_trdm ld_trc_restart = .false. ! restart for ML diagnostics101 ln_trdm ld_trc_instant = .true. ! flag to diagnose trends of instantantaneous or mean ML T/S100 ln_trdmxl_trc_restart = .false. ! restart for ML diagnostics 101 ln_trdmxl_trc_instant = .true. ! flag to diagnose trends of instantantaneous or mean ML T/S 102 102 ln_trdtrc(1) = .true. 103 103 ln_trdtrc(2) = .true. -
branches/NERC/dev_r5518_GO6_package_trdtrc/NEMOGCM/CONFIG/SHARED/namelist_top_ref
r6498 r8463 98 98 nn_ctls_trc = 0 ! control surface type in mixed-layer trends (0,1 or n<jpk) 99 99 rn_ucf_trc = 1 ! unit conversion factor (=1 -> /seconds ; =86400. -> /day) 100 ln_trdm ld_trc_restart = .false. ! restart for ML diagnostics101 ln_trdm ld_trc_instant = .true. ! flag to diagnose trends of instantantaneous or mean ML T/S100 ln_trdmxl_trc_restart = .false. ! restart for ML diagnostics 101 ln_trdmxl_trc_instant = .true. ! flag to diagnose trends of instantantaneous or mean ML T/S 102 102 ln_trdtrc(1) = .true. 103 103 ln_trdtrc(2) = .true. -
branches/NERC/dev_r5518_GO6_package_trdtrc/NEMOGCM/NEMO/TOP_SRC/CFC/trcsms_cfc.F90
r8442 r8463 24 24 USE trdtrc 25 25 USE iom ! I/O library 26 USE wrk_nemo 26 27 27 28 IMPLICIT NONE … … 54 55 REAL(wp) :: xconv3 = 1.0e+3 ! conversion from mol/l/atm to mol/m3/atm 55 56 REAL(wp) :: xconv4 = 1.0e-12 ! conversion from mol/m3/atm to mol/m3/pptv 57 58 !! trend temporary array: 59 REAL(wp), POINTER, DIMENSION(:,:,:) :: ztrcfc 56 60 57 61 !! * Substitutions … … 265 269 ! 266 270 IF( l_trdtrc ) THEN 271 CALL wrk_alloc( jpi, jpj, jpk, ztrcfc ) 267 272 DO jn = jp_cfc0, jp_cfc1 268 CALL trd_trc( tra(:,:,:,jn), jn, jptra_sms, kt ) ! save trends 273 ztrcfc(:,:,:) = tra(:,:,:,jn) 274 CALL trd_trc( ztrcfc, jn, jptra_sms, kt ) ! save trends 269 275 END DO 276 CALL wrk_dealloc( jpi, jpj, jpk, ztrcfc ) 270 277 END IF 271 278 ! -
branches/NERC/dev_r5518_GO6_package_trdtrc/NEMOGCM/NEMO/TOP_SRC/MEDUSA/bio_medusa_update.F90
r8453 r8463 70 70 USE lib_mpp, ONLY: ctl_stop 71 71 USE par_kind, ONLY: wp 72 USE par_medusa, ONLY: jp_medusa, 72 USE par_medusa, ONLY: jp_medusa, jp_msa0, jp_msa1, & 73 73 jpalk, jpchd, jpchn, jpdet, jpdic, & 74 74 jpdin, jpdtc, jpfer, jpoxy, jppds, & … … 78 78 jpoxy_lc, jppds_lc, jpphd_lc, jpphn_lc, & 79 79 jpsil_lc, jpzme_lc, jpzmi_lc 80 USE par_oce, ONLY: jpi, jpim1, jpj, jpjm1 80 USE par_oce, ONLY: jpi, jpim1, jpj, jpjm1, jpk 81 81 USE par_trc, ONLY: jptra 82 82 USE sms_medusa, ONLY: friver_dep, & … … 91 91 xxi 92 92 USE trc, ONLY: med_diag, tra 93 USE trd_oce, ONLY: jptra_sms94 USE trdtrc95 93 96 94 !!* Substitution … … 121 119 !! temporary variables 122 120 REAL(wp) :: fq0 123 124 !! trend temporary array:125 REAL(wp), POINTER, DIMENSION(:,:,:) :: ztrmed126 121 127 122 !!========================================================== … … 739 734 ENDDO 740 735 741 !! MEDUSA SMS trends:742 IF( l_trdtrc ) THEN743 CALL wrk_alloc( jpi, jpj, jpk, ztrmed )744 DO jn = jp_msa0, jp_msa1745 ztrmed(:,:,:) = tra(:,:,:,jn)746 CALL trd_trc( ztrmed, jn, jptra_sms, kt ) ! save trends747 END DO748 CALL wrk_dealloc( jpi, jpj, jpk, ztrmed )749 END IF750 751 736 DO jj = 2,jpjm1 752 737 DO ji = 2,jpim1 -
branches/NERC/dev_r5518_GO6_package_trdtrc/NEMOGCM/NEMO/TOP_SRC/MEDUSA/trcsms_medusa.F90
r8074 r8463 22 22 USE trcsed_medusa 23 23 USE trcavg_medusa 24 !! for SMS trends 25 USE par_medusa, ONLY: jp_msa0, jp_msa1 26 USE par_oce, ONLY: jpi, jpj, jpk 27 USE trd_oce, ONLY: jptra_sms, l_trdtrc 28 USE trdtrc 24 29 25 30 … … 46 51 !!---------------------------------------------------------------------- 47 52 INTEGER, INTENT(in) :: kt ! ocean time-step index 53 !! Loop variables 54 INTEGER :: jn 55 !! trend temporary array: 56 REAL(wp), POINTER, DIMENSION(:,:,:) :: ztrmed 57 48 58 49 59 # if defined key_debug_medusa … … 95 105 # endif 96 106 107 !! MEDUSA SMS trends: 108 IF( l_trdtrc ) THEN 109 CALL wrk_alloc( jpi, jpj, jpk, ztrmed ) 110 DO jn = jp_msa0, jp_msa1 111 ztrmed(:,:,:) = tra(:,:,:,jn) 112 CALL trd_trc( ztrmed, jn, jptra_sms, kt ) ! save trends 113 END DO 114 CALL wrk_dealloc( jpi, jpj, jpk, ztrmed ) 115 END IF 116 117 97 118 END SUBROUTINE trc_sms_medusa 98 119 -
branches/NERC/dev_r5518_GO6_package_trdtrc/NEMOGCM/NEMO/TOP_SRC/trcnam.F90
r8453 r8463 79 79 80 80 ! ! Parameters of additional diagnostics 81 IF( .NOT. lk_ offline )CALL trc_nam_dia81 IF( .NOT. lk_iomput ) CALL trc_nam_dia 82 82 83 83 ! ! namelist of transport
Note: See TracChangeset
for help on using the changeset viewer.
