Changeset 13662 for NEMO/branches/2019/dev_r11842_SI3-10_EAP/src/TOP/PISCES/P4Z/p4zrem.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/p4zrem.F90 (modified) (3 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/p4zrem.F90

@@ -68 +68 @@
       REAL(wp), DIMENSION(jpi,jpj    ) :: ztempbac
       REAL(wp), DIMENSION(jpi,jpj,jpk) :: zdepbac, zolimi, zdepprod, zfacsi, zfacsib, zdepeff, zfebact
-      REAL(wp), ALLOCATABLE, DIMENSION(:,:,:) :: zw3d
       !!---------------------------------------------------------------------
       !
@@ -274 +273 @@
        ENDIF
 
-      IF( knt == nrdttrc ) THEN
-          zrfact2 = 1.e3 * rfact2r
-          ALLOCATE( zw3d(jpi,jpj,jpk) )
-          zfact = 1.e+3 * rfact2r  !  conversion from mol/l/kt to  mol/m3/s
+      IF( lk_iomput .AND. knt == nrdttrc ) THEN
+          zrfact2 = 1.e+3 * rfact2r  !  conversion from mol/l/kt to  mol/m3/s
           !
-          IF( iom_use( "REMIN" ) )  THEN
-              zw3d(:,:,:) = zolimi(:,:,:) * tmask(:,:,:) * zfact !  Remineralisation rate
-              CALL iom_put( "REMIN"  , zw3d )
+          IF( iom_use( "REMIN" ) )  THEN !  Remineralisation rate
+             zolimi(:,:,jpk) = 0. ; CALL iom_put( "REMIN"  , zolimi(:,:,:) * tmask(:,:,:) * zrfact2  )
           ENDIF
-          IF( iom_use( "DENIT" ) )  THEN
-              zw3d(:,:,:) = denitr(:,:,:) * rdenit * rno3 * tmask(:,:,:) * zfact ! Denitrification
-              CALL iom_put( "DENIT"  , zw3d )
+          CALL iom_put( "DENIT"  , denitr(:,:,:) * rdenit * rno3 * tmask(:,:,:) * zrfact2 ) ! Denitrification 
+          IF( iom_use( "BACT" ) )  THEN ! Bacterial biomass
+             zdepbac(:,:,jpk) = 0.  ;   CALL iom_put( "BACT", zdepbac(:,:,:) * 1.E6 * tmask(:,:,:) )
           ENDIF
-          IF( iom_use( "BACT" ) )  THEN
-               zw3d(:,:,:) = zdepbac(:,:,:) * 1.E6 * tmask(:,:,:)  ! Bacterial biomass
-               CALL iom_put( "BACT", zw3d )
-          ENDIF
-          IF( iom_use( "FEBACT" ) )  THEN
-               zw3d(:,:,:) = zfebact(:,:,:) * 1E9 * tmask(:,:,:) * zrfact2   ! Bacterial iron consumption
-               CALL iom_put( "FEBACT" , zw3d )
-          ENDIF
-          !
-          DEALLOCATE( zw3d )
+          CALL iom_put( "FEBACT" , zfebact(:,:,:) * 1E9 * tmask(:,:,:) * zrfact2  )
        ENDIF
       !
@@ -327 +314 @@
       ENDIF
       !
-      REWIND( numnatp_ref )              ! Namelist nampisrem in reference namelist : Pisces remineralization
+      REWIND( numnatp_ref )
       READ  ( numnatp_ref, nampisrem, IOSTAT = ios, ERR = 901)
 901   IF( ios /= 0 )   CALL ctl_nam ( ios , 'nampisrem in reference namelist' )
-      REWIND( numnatp_cfg )              ! Namelist nampisrem in configuration namelist : Pisces remineralization
+
+      REWIND( numnatp_cfg )
       READ  ( numnatp_cfg, nampisrem, IOSTAT = ios, ERR = 902 )
 902   IF( ios >  0 )   CALL ctl_nam ( ios , 'nampisrem in configuration namelist' )

@@ -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