Changeset 13662 for NEMO/branches/2019/dev_r11842_SI3-10_EAP/src/TOP/PISCES/P4Z/p4zsink.F90

Timestamp:

2020-10-22T20:49:56+02:00 (4 years ago)

Author:

clem

Message:

update to almost r4.0.4

Location:

NEMO/branches/2019/dev_r11842_SI3-10_EAP

Files:

• . (modified) (1 prop)
• src/TOP/PISCES/P4Z/p4zsink.F90 (modified) (2 diffs)

NEMO/branches/2019/dev_r11842_SI3-10_EAP

@@ -1 @@
-^/utils/build/arch@HEAD       arch
-^/utils/build/makenemo@HEAD   makenemo
-^/utils/build/mk@HEAD         mk
-^/utils/tools@HEAD            tools
-^/vendors/AGRIF/dev@HEAD      ext/AGRIF
-^/vendors/FCM@HEAD            ext/FCM
-^/vendors/IOIPSL@HEAD         ext/IOIPSL
+^/utils/build/arch@12130      arch
+^/utils/build/makenemo@12191  makenemo
+^/utils/build/mk@11662        mk
+^/utils/tools_r4.0-HEAD@12672 tools
+^/vendors/AGRIF/dev@10586     ext/AGRIF
+^/vendors/FCM@10134           ext/FCM
+^/vendors/IOIPSL@9655         ext/IOIPSL
+
+# SETTE mapping (inactive)
+#^/utils/CI/sette@12135        sette

@@ -1 @@
-^/utils/build/arch@HEAD       arch
-^/utils/build/makenemo@HEAD   makenemo
-^/utils/build/mk@HEAD         mk
-^/utils/tools@HEAD            tools
-^/vendors/AGRIF/dev@HEAD      ext/AGRIF
-^/vendors/FCM@HEAD            ext/FCM
-^/vendors/IOIPSL@HEAD         ext/IOIPSL
+^/utils/build/arch@12130      arch
+^/utils/build/makenemo@12191  makenemo
+^/utils/build/mk@11662        mk
+^/utils/tools_r4.0-HEAD@12672 tools
+^/vendors/AGRIF/dev@10586     ext/AGRIF
+^/vendors/FCM@10134           ext/FCM
+^/vendors/IOIPSL@9655         ext/IOIPSL
+
+# SETTE mapping (inactive)
+#^/utils/CI/sette@12135        sette

NEMO/branches/2019/dev_r11842_SI3-10_EAP/src/TOP/PISCES/P4Z/p4zsink.F90

@@ -62 +62 @@
       CHARACTER (len=25) :: charout
       REAL(wp) :: zmax, zfact
-      REAL(wp), ALLOCATABLE, DIMENSION(:,:,:) :: zw3d
-      REAL(wp), ALLOCATABLE, DIMENSION(:,:  ) :: zw2d
       !!---------------------------------------------------------------------
       !
@@ -129 +127 @@
         &   t_oce_co2_exp = glob_sum( 'p4zsink', ( sinking(:,:,ik100) + sinking2(:,:,ik100) ) * e1e2t(:,:) * tmask(:,:,1) )
      !
-     IF( lk_iomput ) THEN
-       IF( knt == nrdttrc ) THEN
-          ALLOCATE( zw2d(jpi,jpj), zw3d(jpi,jpj,jpk) )
-          zfact = 1.e+3 * rfact2r  !  conversion from mol/l/kt to  mol/m3/s
-          !
-          IF( iom_use( "EPC100" ) )  THEN
-              zw2d(:,:) = ( sinking(:,:,ik100) + sinking2(:,:,ik100) ) * zfact * tmask(:,:,1) ! Export of carbon at 100m
-              CALL iom_put( "EPC100"  , zw2d )
-          ENDIF
-          IF( iom_use( "EPFE100" ) )  THEN
-              zw2d(:,:) = ( sinkfer(:,:,ik100) + sinkfer2(:,:,ik100) ) * zfact * tmask(:,:,1) ! Export of iron at 100m
-              CALL iom_put( "EPFE100"  , zw2d )
-          ENDIF
-          IF( iom_use( "EPCAL100" ) )  THEN
-              zw2d(:,:) = sinkcal(:,:,ik100) * zfact * tmask(:,:,1) ! Export of calcite at 100m
-              CALL iom_put( "EPCAL100"  , zw2d )
-          ENDIF
-          IF( iom_use( "EPSI100" ) )  THEN
-              zw2d(:,:) =  sinksil(:,:,ik100) * zfact * tmask(:,:,1) ! Export of bigenic silica at 100m
-              CALL iom_put( "EPSI100"  , zw2d )
-          ENDIF
-          IF( iom_use( "EXPC" ) )  THEN
-              zw3d(:,:,:) = ( sinking(:,:,:) + sinking2(:,:,:) ) * zfact * tmask(:,:,:) ! Export of carbon in the water column
-              CALL iom_put( "EXPC"  , zw3d )
-          ENDIF
-          IF( iom_use( "EXPFE" ) )  THEN
-              zw3d(:,:,:) = ( sinkfer(:,:,:) + sinkfer2(:,:,:) ) * zfact * tmask(:,:,:) ! Export of iron 
-              CALL iom_put( "EXPFE"  , zw3d )
-          ENDIF
-          IF( iom_use( "EXPCAL" ) )  THEN
-              zw3d(:,:,:) = sinkcal(:,:,:) * zfact * tmask(:,:,:) ! Export of calcite 
-              CALL iom_put( "EXPCAL"  , zw3d )
-          ENDIF
-          IF( iom_use( "EXPSI" ) )  THEN
-              zw3d(:,:,:) = sinksil(:,:,:) * zfact * tmask(:,:,:) ! Export of bigenic silica
-              CALL iom_put( "EXPSI"  , zw3d )
-          ENDIF
-          IF( iom_use( "tcexp" ) )  CALL iom_put( "tcexp" , t_oce_co2_exp * zfact )   ! molC/s
-          ! 
-          DEALLOCATE( zw2d, zw3d )
-        ENDIF
+     IF( lk_iomput .AND.  knt == nrdttrc ) THEN
+       zfact = 1.e+3 * rfact2r  !  conversion from mol/l/kt to  mol/m3/s
+       !
+       CALL iom_put( "EPC100"  , ( sinking(:,:,ik100) + sinking2(:,:,ik100) ) * zfact * tmask(:,:,1) ) ! Export of carbon at 100m 
+       CALL iom_put( "EPFE100" , ( sinkfer(:,:,ik100) + sinkfer2(:,:,ik100) ) * zfact * tmask(:,:,1) ) ! Export of iron at 100m 
+       CALL iom_put( "EPCAL100", sinkcal(:,:,ik100) * zfact * tmask(:,:,1) )      ! Export of calcite at 100m 
+       CALL iom_put( "EPSI100" , sinksil(:,:,ik100) * zfact * tmask(:,:,1) )          ! Export of bigenic silica at 100m 
+       CALL iom_put( "EXPC"    , ( sinking(:,:,:) + sinking2(:,:,:) ) * zfact * tmask(:,:,:) ) ! Export of carbon in the water column 
+       CALL iom_put( "EXPFE"   , ( sinkfer(:,:,:) + sinkfer2(:,:,:) ) * zfact * tmask(:,:,:) ) ! Export of iron  
+       CALL iom_put( "EXPCAL"  , sinkcal(:,:,:) * zfact * tmask(:,:,:) )      ! Export of calcite 
+       CALL iom_put( "EXPSI"   , sinksil(:,:,:) * zfact * tmask(:,:,:) )      ! Export of bigenic silica
+       CALL iom_put( "tcexp"   , t_oce_co2_exp * zfact )   ! molC/s
+       ! 
       ENDIF
       !

@@ -1 @@
-^/utils/build/arch@HEAD       arch
-^/utils/build/makenemo@HEAD   makenemo
-^/utils/build/mk@HEAD         mk
-^/utils/tools@HEAD            tools
-^/vendors/AGRIF/dev@HEAD      ext/AGRIF
-^/vendors/FCM@HEAD            ext/FCM
-^/vendors/IOIPSL@HEAD         ext/IOIPSL
+^/utils/build/arch@12130      arch
+^/utils/build/makenemo@12191  makenemo
+^/utils/build/mk@11662        mk
+^/utils/tools_r4.0-HEAD@12672 tools
+^/vendors/AGRIF/dev@10586     ext/AGRIF
+^/vendors/FCM@10134           ext/FCM
+^/vendors/IOIPSL@9655         ext/IOIPSL
+
+# SETTE mapping (inactive)
+#^/utils/CI/sette@12135        sette