Changeset 7254 for branches/NERC/dev_r5518_NOC_MEDUSA_Stable/NEMOGCM/NEMO
- Timestamp:
- 2016-11-17T17:16:37+01:00 (7 years ago)
- Location:
- branches/NERC/dev_r5518_NOC_MEDUSA_Stable/NEMOGCM/NEMO/TOP_SRC/MEDUSA
- Files:
-
- 3 edited
-
trcbio_medusa.F90 (modified) (11 diffs)
-
trcnam_medusa.F90 (modified) (2 diffs)
-
trcoxy_medusa.F90 (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
branches/NERC/dev_r5518_NOC_MEDUSA_Stable/NEMOGCM/NEMO/TOP_SRC/MEDUSA/trcbio_medusa.F90
r7227 r7254 389 389 REAL(wp), POINTER, DIMENSION(:,:,:) :: expc3, expn3 390 390 REAL(wp), POINTER, DIMENSION(:,:,:) :: fediss3, fescav3 391 REAL(wp), POINTER, DIMENSION(:,:,:) :: migrazp3, migrazd3, megrazp3, m igrazd3, migrazz3391 REAL(wp), POINTER, DIMENSION(:,:,:) :: migrazp3, migrazd3, megrazp3, megrazd3, megrazz3 392 392 REAL(wp), POINTER, DIMENSION(:,:,:) :: o2sat3, pbsi3, pcal3, remoc3 393 393 REAL(wp), POINTER, DIMENSION(:,:,:) :: pnlimj3, pnlimn3, pnlimfe3, pdlimj3, pdlimn3, pdlimfe3, pdlimsi3 … … 739 739 !! skip SEAFLRXX, MED_XXXX, INTFLX_XX, INT_XX, ML_XXX, OCAL_XXX, FE_XXXX, MED_XZE, WIND diagnostics here 740 740 !! 741 IF( med_diag%RR_0100%dgsave ) THEN 742 CALL wrk_alloc( jpi, jpj, ffastca2d ) 743 ffastca2d(:,:) = 0.0 !! 744 ENDIF 745 741 746 IF( med_diag%ATM_PCO2%dgsave ) THEN 742 747 CALL wrk_alloc( jpi, jpj, f_pco2a2d ) … … 995 1000 !! 996 1001 !! AXY (10/11/16): CMIP6 diagnostics, 2D 997 IF( med_diag%FGCO2%dgsave ) THEN 1002 !! JPALM -- 17-11-16 -- put fgco2 alloc out of diag request 1003 !! needed for coupling/passed through restart 1004 !! IF( med_diag%FGCO2%dgsave ) THEN 998 1005 CALL wrk_alloc( jpi, jpj, fgco2 ) 999 1006 fgco2(:,:) = 0.0 !! 1000 ENDIF1007 !! ENDIF 1001 1008 IF( med_diag%INTDISSIC%dgsave ) THEN 1002 1009 CALL wrk_alloc( jpi, jpj, intdissic ) … … 1805 1812 !! 1806 1813 !! store 2D outputs 1814 !! 1815 !! JPALM -- 17-11-16 -- put fgco2 out of diag request 1816 !! is needed for coupling; pass through restart 1817 !! IF( med_diag%FGCO2%dgsave ) THEN 1818 !! convert from mol/m2/day to kg/m2/s 1819 fgco2(ji,jj) = f_co2flux * fthk * CO2flux_conv !! mmol-C/m3/d -> kg-CO2/m2/s 1820 !! ENDIF 1807 1821 IF ( lk_iomput ) THEN 1808 1822 IF( med_diag%ATM_PCO2%dgsave ) THEN … … 1814 1828 IF( med_diag%CO2FLUX%dgsave ) THEN 1815 1829 f_co2flux2d(ji,jj) = f_co2flux * fthk !! mmol/m3/d -> mmol/m2/d 1816 ENDIF1817 !! AXY (10/11/16): CMIP6 equivalent1818 IF( med_diag%FGCO2%dgsave ) THEN1819 !! convert from mol/m2/day to kg/m2/s1820 fgco2(ji,jj) = f_co2flux * fthk * CO2flux_conv !! mmol-C/m3/d -> kg-CO2/m2/s1821 1830 ENDIF 1822 1831 IF( med_diag%TCO2%dgsave ) THEN … … 1845 1854 !! AXY (11/11/16): CMIP6 oxygen saturation 3D diagnostic 1846 1855 IF ( med_diag%O2SAT3%dgsave ) THEN 1847 oxy_sato( ztmp, zsal, f_o2sat3 )1856 call oxy_sato( ztmp, zsal, f_o2sat3 ) 1848 1857 o2sat3(ji, jj, jk) = f_o2sat3 1849 1858 ENDIF … … 4696 4705 !! both outputs the CO2 flux in specified units and 4697 4706 !! sends the resulting field to the coupler 4707 !! JPALM (17/11/16): put CO2 flux (fgco2) alloc/unalloc/pass to zn 4708 !! out of diag list request 4709 CALL lbc_lnk( fgco2(:,:),'T',1. ) 4698 4710 IF( med_diag%FGCO2%dgsave ) THEN 4699 CALL lbc_lnk( fgco2(:,:),'T',1. )4700 4711 CALL iom_put( "FGCO2" , fgco2 ) 4701 zb_co2_flx = zn_co2_flx 4702 zn_co2_flx = fgco2 4703 IF (lk_oasis) THEN 4704 CO2Flux_out_cpl = zn_co2_flx 4705 ENDIF 4706 CALL wrk_dealloc( jpi, jpj, fgco2 ) 4707 ENDIF 4712 ENDIF 4713 !! JPALM (17/11/16): should mv this fgco2 part 4714 !! out of lk_iomput loop 4715 zb_co2_flx = zn_co2_flx 4716 zn_co2_flx = fgco2 4717 IF (lk_oasis) THEN 4718 CO2Flux_out_cpl = zn_co2_flx 4719 ENDIF 4720 CALL wrk_dealloc( jpi, jpj, fgco2 ) 4721 !! --- 4708 4722 IF( med_diag%OM_CAL%dgsave ) THEN 4709 4723 CALL iom_put( "OM_CAL" , f_omcal ) … … 4714 4728 IF( med_diag%TCO2%dgsave ) THEN 4715 4729 CALL iom_put( "TCO2" , f_TDIC2d ) 4716 4730 CALL wrk_dealloc( jpi, jpj, f_TDIC2d ) 4717 4731 ENDIF 4718 4732 IF( med_diag%TALK%dgsave ) THEN 4719 4733 CALL iom_put( "TALK" , f_TALK2d ) 4720 4734 CALL wrk_dealloc( jpi, jpj, f_TALK2d ) 4721 4735 ENDIF 4722 4736 IF( med_diag%KW660%dgsave ) THEN 4723 4737 CALL iom_put( "KW660" , f_kw6602d ) 4724 4738 CALL wrk_dealloc( jpi, jpj, f_kw6602d ) 4725 4739 ENDIF 4726 4740 IF( med_diag%ATM_PP0%dgsave ) THEN 4727 4741 CALL iom_put( "ATM_PP0" , f_pp02d ) 4728 4742 CALL wrk_dealloc( jpi, jpj, f_pp02d ) 4729 4743 ENDIF 4730 4744 IF( med_diag%O2FLUX%dgsave ) THEN 4731 4745 CALL iom_put( "O2FLUX" , f_o2flux2d ) 4732 4746 CALL wrk_dealloc( jpi, jpj, f_o2flux2d ) 4733 4747 ENDIF 4734 4748 IF( med_diag%O2SAT%dgsave ) THEN 4735 4749 CALL iom_put( "O2SAT" , f_o2sat2d ) 4736 4750 CALL wrk_dealloc( jpi, jpj, f_o2sat2d ) 4737 4751 ENDIF 4738 4752 IF( med_diag%CAL_CCD%dgsave ) THEN … … 4755 4769 IF( med_diag%DMS_ANDR%dgsave ) THEN 4756 4770 CALL iom_put( "DMS_ANDR" , dms_andr2d ) 4757 4771 CALL wrk_dealloc( jpi, jpj, dms_andr2d ) 4758 4772 ENDIF 4759 4773 IF( med_diag%DMS_SIMO%dgsave ) THEN 4760 4774 CALL iom_put( "DMS_SIMO" , dms_simo2d ) 4761 4775 CALL wrk_dealloc( jpi, jpj, dms_simo2d ) 4762 4776 ENDIF 4763 4777 IF( med_diag%DMS_ARAN%dgsave ) THEN 4764 4778 CALL iom_put( "DMS_ARAN" , dms_aran2d ) 4765 4779 CALL wrk_dealloc( jpi, jpj, dms_aran2d ) 4766 4780 ENDIF 4767 4781 IF( med_diag%DMS_HALL%dgsave ) THEN 4768 4782 CALL iom_put( "DMS_HALL" , dms_hall2d ) 4769 4783 CALL wrk_dealloc( jpi, jpj, dms_hall2d ) 4770 4784 ENDIF 4771 4785 ENDIF … … 4861 4875 # endif 4862 4876 IF( med_diag%SDT__500%dgsave ) THEN 4863 CALL iom_put( "SDT__500" , f regen2d)4877 CALL iom_put( "SDT__500" , fslownflux ) 4864 4878 ENDIF 4865 4879 IF( med_diag%REG__500%dgsave ) THEN … … 5756 5770 IF( med_diag%INTDISSIC%dgsave ) THEN 5757 5771 CALL iom_put( "INTDISSIC" , intdissic ) 5758 CALL wrk_dealloc( jpi, jpj, jpk,intdissic )5772 CALL wrk_dealloc( jpi, jpj, intdissic ) 5759 5773 ENDIF 5760 5774 IF( med_diag%INTDISSIN%dgsave ) THEN 5761 5775 CALL iom_put( "INTDISSIN" , intdissin ) 5762 CALL wrk_dealloc( jpi, jpj, jpk,intdissin )5776 CALL wrk_dealloc( jpi, jpj, intdissin ) 5763 5777 ENDIF 5764 5778 IF( med_diag%INTDISSISI%dgsave ) THEN 5765 5779 CALL iom_put( "INTDISSISI" , intdissisi ) 5766 CALL wrk_dealloc( jpi, jpj, jpk,intdissisi )5780 CALL wrk_dealloc( jpi, jpj, intdissisi ) 5767 5781 ENDIF 5768 5782 IF( med_diag%INTTALK%dgsave ) THEN 5769 5783 CALL iom_put( "INTTALK" , inttalk ) 5770 CALL wrk_dealloc( jpi, jpj, jpk,inttalk )5784 CALL wrk_dealloc( jpi, jpj, inttalk ) 5771 5785 ENDIF 5772 5786 IF( med_diag%O2min%dgsave ) THEN 5773 5787 CALL iom_put( "O2min" , o2min ) 5774 CALL wrk_dealloc( jpi, jpj, jpk,o2min )5788 CALL wrk_dealloc( jpi, jpj, o2min ) 5775 5789 ENDIF 5776 5790 IF( med_diag%ZO2min%dgsave ) THEN 5777 5791 CALL iom_put( "ZO2min" , zo2min ) 5778 CALL wrk_dealloc( jpi, jpj, jpk,zo2min )5792 CALL wrk_dealloc( jpi, jpj, zo2min ) 5779 5793 ENDIF 5780 5794 !! -
branches/NERC/dev_r5518_NOC_MEDUSA_Stable/NEMOGCM/NEMO/TOP_SRC/MEDUSA/trcnam_medusa.F90
r7224 r7254 2261 2261 med_diag%EXPN3%dgsave = .FALSE. 2262 2262 ENDIF 2263 IF (iom_use("EXPCALC3")) THEN2264 med_diag%EXPCALC3%dgsave = .TRUE.2265 ELSE2266 med_diag%EXPCALC3%dgsave = .FALSE.2267 ENDIF2268 IF (iom_use("EXPSI3")) THEN2269 med_diag%EXPSI3%dgsave = .TRUE.2270 ELSE2271 med_diag%EXPSI3%dgsave = .FALSE.2272 ENDIF2273 2263 IF (iom_use("FEDISS3")) THEN 2274 2264 med_diag%FEDISS3%dgsave = .TRUE. … … 2336 2326 med_diag%PNLIMN3%dgsave = .FALSE. 2337 2327 ENDIF 2338 IF (iom_use("PNLI FEJ3")) THEN2328 IF (iom_use("PNLIMFE3")) THEN 2339 2329 med_diag%PNLIMFE3%dgsave = .TRUE. 2340 2330 ELSE -
branches/NERC/dev_r5518_NOC_MEDUSA_Stable/NEMOGCM/NEMO/TOP_SRC/MEDUSA/trcoxy_medusa.F90
r5841 r7254 23 23 24 24 PUBLIC trc_oxy_medusa ! called in trc_bio_medusa 25 PUBLIC oxy_sato ! called in trc_bio_medusa 25 26 26 27 !!* Substitution
Note: See TracChangeset
for help on using the changeset viewer.
