Changeset 8560
- Timestamp:
- 2017-09-22T17:23:46+02:00 (7 years ago)
- Location:
- branches/NERC/dev_r5518_GO6_package_trdtrc/NEMOGCM
- Files:
-
- 2 edited
-
CONFIG/SHARED/field_def_bgc.xml (modified) (7 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
r8558 r8560 676 676 <field id="BBL_OXY" long_name="dissolved oxygen" unit="mmolO2/m3/s" /> 677 677 <!-- trd case: jptra_nsr --> 678 <field id="FOR_CHN" long_name="Chl-a concentration in non-diatom phytoplankton" unit="mg Chl/m3/s" grid_ref="grid_T_2D"/>679 <field id="FOR_CHD" long_name="Chl-a concentration in diatom phytoplankton" unit="mg Chl/m3/s" grid_ref="grid_T_2D"/>680 <field id="FOR_PHN" long_name="non-diatom phytoplankton" unit="mmol-N/m3/s" grid_ref="grid_T_2D"/>681 <field id="FOR_PHD" long_name="diatom phytoplankton" unit="mmol-N/m3/s" grid_ref="grid_T_2D"/>682 <field id="FOR_ZMI" long_name="micro zooplankton" unit="mmol-N/m3/s" grid_ref="grid_T_2D"/>683 <field id="FOR_ZME" long_name="meso zooplankton" unit="mmol-N/m3/s" grid_ref="grid_T_2D"/>684 <field id="FOR_DIN" long_name="dissolved inorganic nitrogen" unit="mmol-N/m3/s" grid_ref="grid_T_2D"/>685 <field id="FOR_SIL" long_name="dissolved silicic acid" unit="mmolSi/m3/s" grid_ref="grid_T_2D"/>686 <field id="FOR_FER" long_name="dissolved iron" unit="mmolFe/m3/s" grid_ref="grid_T_2D"/>687 <field id="FOR_DET" long_name="detrital nitrogen" unit="mmol-N/m3/s" grid_ref="grid_T_2D"/>688 <field id="FOR_PDS" long_name="biogenic silicon in diatom phytoplankton" unit="mmolSi/m3/s" grid_ref="grid_T_2D"/>689 <field id="FOR_DTC" long_name="detrital carbon" unit="mmol-C/m3/s" grid_ref="grid_T_2D"/>690 <field id="FOR_DiC" long_name="dissolved inorganic carbon" unit="mmol-C/m3/s" grid_ref="grid_T_2D"/>691 <field id="FOR_ALK" long_name="alkalinity" unit="meq/m3/s" grid_ref="grid_T_2D"/>692 <field id="FOR_OXY" long_name="dissolved oxygen" unit="mmolO2/m3/s" grid_ref="grid_T_2D"/>678 <field id="FOR_CHN" long_name="Chl-a concentration in non-diatom phytoplankton" unit="mg Chl/m3/s" /> 679 <field id="FOR_CHD" long_name="Chl-a concentration in diatom phytoplankton" unit="mg Chl/m3/s" /> 680 <field id="FOR_PHN" long_name="non-diatom phytoplankton" unit="mmol-N/m3/s" /> 681 <field id="FOR_PHD" long_name="diatom phytoplankton" unit="mmol-N/m3/s" /> 682 <field id="FOR_ZMI" long_name="micro zooplankton" unit="mmol-N/m3/s" /> 683 <field id="FOR_ZME" long_name="meso zooplankton" unit="mmol-N/m3/s" /> 684 <field id="FOR_DIN" long_name="dissolved inorganic nitrogen" unit="mmol-N/m3/s" /> 685 <field id="FOR_SIL" long_name="dissolved silicic acid" unit="mmolSi/m3/s" /> 686 <field id="FOR_FER" long_name="dissolved iron" unit="mmolFe/m3/s" /> 687 <field id="FOR_DET" long_name="detrital nitrogen" unit="mmol-N/m3/s" /> 688 <field id="FOR_PDS" long_name="biogenic silicon in diatom phytoplankton" unit="mmolSi/m3/s" /> 689 <field id="FOR_DTC" long_name="detrital carbon" unit="mmol-C/m3/s" /> 690 <field id="FOR_DiC" long_name="dissolved inorganic carbon" unit="mmol-C/m3/s" /> 691 <field id="FOR_ALK" long_name="alkalinity" unit="meq/m3/s" /> 692 <field id="FOR_OXY" long_name="dissolved oxygen" unit="mmolO2/m3/s" /> 693 693 <!-- trd case: jptra_zdf --> 694 694 <field id="ZDF_CHN" long_name="Chl-a concentration in non-diatom phytoplankton" unit="mg Chl/m3/s" /> … … 905 905 <field id="LDF_IDTRA" long_name="Ideal traceur concentration " unit="mmol/m3/s" /> 906 906 <field id="BBL_IDTRA" long_name="Ideal traceur concentration " unit="mmol/m3/s" /> 907 <field id="FOR_IDTRA" long_name="Ideal traceur concentration " unit="mmol/m3/s" grid_ref="grid_T_2D"/>907 <field id="FOR_IDTRA" long_name="Ideal traceur concentration " unit="mmol/m3/s" /> 908 908 <field id="ZDF_IDTRA" long_name="Ideal traceur concentration " unit="mmol/m3/s" /> 909 909 <field id="ZDP_IDTRA" long_name="Ideal traceur concentration " unit="mmol/m3/s" /> … … 929 929 <field id="LDF_CFC11" long_name="CFC-11 Concentration" unit="umol/m3/s" /> 930 930 <field id="BBL_CFC11" long_name="CFC-11 Concentration" unit="umol/m3/s" /> 931 <field id="FOR_CFC11" long_name="CFC-11 Concentration" unit="umol/m3/s" grid_ref="grid_T_2D"/>931 <field id="FOR_CFC11" long_name="CFC-11 Concentration" unit="umol/m3/s" /> 932 932 <field id="ZDF_CFC11" long_name="CFC-11 Concentration" unit="umol/m3/s" /> 933 933 <field id="ZDP_CFC11" long_name="CFC-11 Concentration" unit="umol/m3/s" /> … … 952 952 <field id="LDF_CFC12" long_name="CFC-12 Concentration" unit="umol/m3/s" /> 953 953 <field id="BBL_CFC12" long_name="CFC-12 Concentration" unit="umol/m3/s" /> 954 <field id="FOR_CFC12" long_name="CFC-12 Concentration" unit="umol/m3/s" grid_ref="grid_T_2D"/>954 <field id="FOR_CFC12" long_name="CFC-12 Concentration" unit="umol/m3/s" /> 955 955 <field id="ZDF_CFC12" long_name="CFC-12 Concentration" unit="umol/m3/s" /> 956 956 <field id="ZDP_CFC12" long_name="CFC-12 Concentration" unit="umol/m3/s" /> … … 975 975 <field id="LDF_SF6" long_name="SF6 Concentration" unit="umol/m3/s" /> 976 976 <field id="BBL_SF6" long_name="SF6 Concentration" unit="umol/m3/s" /> 977 <field id="FOR_SF6" long_name="SF6 Concentration" unit="umol/m3/s" grid_ref="grid_T_2D"/>977 <field id="FOR_SF6" long_name="SF6 Concentration" unit="umol/m3/s" /> 978 978 <field id="ZDF_SF6" long_name="SF6 Concentration" unit="umol/m3/s" /> 979 979 <field id="ZDP_SF6" long_name="SF6 Concentration" unit="umol/m3/s" /> … … 998 998 <field id="LDF_C14B" long_name="Bomb C14 Concentration" unit="1/s" /> 999 999 <field id="BBL_C14B" long_name="Bomb C14 Concentration" unit="1/s" /> 1000 <field id="FOR_C14B" long_name="Bomb C14 Concentration" unit="1/s" grid_ref="grid_T_2D"/>1000 <field id="FOR_C14B" long_name="Bomb C14 Concentration" unit="1/s" /> 1001 1001 <field id="ZDF_C14B" long_name="Bomb C14 Concentration" unit="1/s" /> 1002 1002 <field id="ZDP_C14B" long_name="Bomb C14 Concentration" unit="1/s" /> … … 1021 1021 <field id="LDF_Age" long_name="Sea Water Age Since Surface contact" standard_name="sea_water_age_since_surface_contact" unit="yr/s" /> 1022 1022 <field id="BBL_Age" long_name="Sea Water Age Since Surface contact" standard_name="sea_water_age_since_surface_contact" unit="yr/s" /> 1023 <field id="FOR_Age" long_name="Sea Water Age Since Surface contact" standard_name="sea_water_age_since_surface_contact" unit="yr/s" grid_ref="grid_T_2D"/>1023 <field id="FOR_Age" long_name="Sea Water Age Since Surface contact" standard_name="sea_water_age_since_surface_contact" unit="yr/s" /> 1024 1024 <field id="ZDF_Age" long_name="Sea Water Age Since Surface contact" standard_name="sea_water_age_since_surface_contact" unit="yr/s" /> 1025 1025 <field id="ZDP_Age" long_name="Sea Water Age Since Surface contact" standard_name="sea_water_age_since_surface_contact" unit="yr/s" /> -
branches/NERC/dev_r5518_GO6_package_trdtrc/NEMOGCM/NEMO/TOP_SRC/TRP/trcsbc.F90
r8557 r8560 68 68 CHARACTER (len=22) :: charout 69 69 REAL(wp), POINTER, DIMENSION(:,: ) :: zsfx 70 REAL(wp), POINTER, DIMENSION(:,: 70 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, 78 IF( l_trdtrc ) CALL wrk_alloc( jpi, jpj, jpk, ztrtrd ) 79 79 ! 80 80 zrtrn = 1.e-15_wp … … 140 140 DO jn = 1, jptra 141 141 ! 142 IF( l_trdtrc ) ztrtrd(:,:) = tra(:,:,1,jn) ! save trends 143 ! ! add the trend to the general tracer trend 142 IF( l_trdtrc ) THEN 143 ztrtrd(:,:,:) = 0.0 144 ztrtrd(:,:,1) = tra(:,:,1,jn) ! save surface trends 145 ! ! add the trend to the general tracer trend 146 ENDIF 144 147 145 148 IF ( nn_ice_tr == -1 ) THEN ! No tracers in sea ice (null concentration in sea ice) … … 184 187 ! 185 188 IF( l_trdtrc ) THEN 186 ztrtrd(:,: ) = tra(:,:,1,jn) - ztrtrd(:,:)189 ztrtrd(:,:,1) = tra(:,:,1,jn) - ztrtrd(:,:,1) 187 190 CALL trd_tra( kt, 'TRC', jn, jptra_nsr, ztrtrd ) 188 191 END IF … … 207 210 CALL prt_ctl_trc( tab4d=tra, mask=tmask, clinfo=ctrcnm, clinfo2='trd' ) 208 211 ENDIF 209 CALL wrk_dealloc( jpi, jpj, zsfx )210 IF( l_trdtrc ) CALL wrk_dealloc( jpi, jpj, ztrtrd )212 CALL wrk_dealloc( jpi, jpj, zsfx ) 213 IF( l_trdtrc ) CALL wrk_dealloc( jpi, jpj, jpk, ztrtrd ) 211 214 ! 212 215 IF( nn_timing == 1 ) CALL timing_stop('trc_sbc')
Note: See TracChangeset
for help on using the changeset viewer.
