Changeset 9125 for branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zsed.F90

Timestamp:

2017-12-19T09:47:17+01:00 (6 years ago)

Author:

timgraham

Message:

Removed wrk_arrays from whole code. No change in SETTE results from this.

File:

• branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zsed.F90 (modified) (7 diffs)

branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zsed.F90

@@ -62 +62 @@
       !
       CHARACTER (len=25) :: charout
-      REAL(wp), POINTER, DIMENSION(:,:  ) :: zsidep, zwork1, zwork2, zwork3
-      REAL(wp), POINTER, DIMENSION(:,:  ) :: zdenit2d, zironice, zbureff
-      REAL(wp), POINTER, DIMENSION(:,:  ) :: zwsbio3, zwsbio4, zwscal
-      REAL(wp), POINTER, DIMENSION(:,:  ) :: zsedcal, zsedsi, zsedc
-      REAL(wp), POINTER, DIMENSION(:,:,:) :: ztrpo4, ztrdop, zirondep, zsoufer, zpdep, zlight
-      REAL(wp), POINTER, DIMENSION(:,:  ) :: zwsfep
+      REAL(wp), DIMENSION(jpi,jpj    ) :: zwork1, zwork2, zwork3
+      REAL(wp), DIMENSION(jpi,jpj    ) :: zdenit2d, zbureff
+      REAL(wp), DIMENSION(jpi,jpj    ) :: zwsbio3, zwsbio4, zwscal
+      REAL(wp), DIMENSION(jpi,jpj    ) :: zsedcal, zsedsi, zsedc
+      REAL(wp), DIMENSION(jpi,jpj,jpk) :: zsoufer, zlight
+      REAL(wp), ALLOCATABLE, DIMENSION(:,:,:) :: ztrpo4, ztrdop, zirondep, zpdep
+      REAL(wp), ALLOCATABLE, DIMENSION(:,:  ) :: zsidep, zwsfep, zironice
       !!---------------------------------------------------------------------
       !
@@ -75 +76 @@
       !
       ! Allocate temporary workspace
-                      CALL wrk_alloc( jpi, jpj, zdenit2d, zwork1, zwork2, zwork3, zbureff )
-                      CALL wrk_alloc( jpi, jpj, zwsbio3, zwsbio4, zwscal )
-                      CALL wrk_alloc( jpi, jpj, zsedcal,  zsedsi, zsedc )
-                      CALL wrk_alloc( jpi, jpj, jpk, zlight, zsoufer )
-      IF( ln_p5z )    CALL wrk_alloc( jpi, jpj, jpk, ztrpo4, ztrdop )
-      IF( ln_ligand ) CALL wrk_alloc( jpi, jpj, zwsfep )
+      IF( ln_p5z )    ALLOCATE( ztrpo4(jpi,jpj,jpk), ztrdop(jpi,jpj,jpk) )
+      IF( ln_ligand ) ALLOCATE( zwsfep(jpi,jpj) )
 
 
@@ -97 +94 @@
       IF( ln_ironice ) THEN  
          !                                              
-         CALL wrk_alloc( jpi, jpj, zironice )
+         ALLOCATE( zironice(jpi,jpj) )
          !                                              
          DO jj = 1, jpj
@@ -114 +111 @@
             &   CALL iom_put( "Ironice", zironice(:,:) * 1.e+3 * rfact2r * e3t_n(:,:,1) * tmask(:,:,1) ) ! iron flux from ice
          !
-         CALL wrk_dealloc( jpi, jpj, zironice )
+         DEALLOCATE( zironice )
          !                                              
       ENDIF
@@ -122 +119 @@
       IF( ln_dust ) THEN
          !                                              
-         CALL wrk_alloc( jpi, jpj,      zsidep )
-         CALL wrk_alloc( jpi, jpj, jpk, zpdep, zirondep      )
+         ALLOCATE( zsidep(jpi,jpj) )
+         ALLOCATE( zpdep(jpi,jpj,jpk), zirondep(jpi,jpj,jpk) )
          !                                              ! Iron and Si deposition at the surface
          IF( ln_solub ) THEN
@@ -152 +149 @@
             ENDIF
          ENDIF
-         CALL wrk_dealloc( jpi, jpj,      zsidep )
-         CALL wrk_dealloc( jpi, jpj, jpk, zpdep, zirondep      )
+         DEALLOCATE( zsidep )
+         DEALLOCATE( zpdep, zirondep )
          !                                              
       ENDIF
@@ -514 +511 @@
       ENDIF
       !
-                      CALL wrk_dealloc( jpi, jpj, zdenit2d, zwork1, zwork2, zwork3, zbureff )
-                      CALL wrk_dealloc( jpi, jpj, zwsbio3, zwsbio4, zwscal )
-                      CALL wrk_dealloc( jpi, jpj, zsedcal,  zsedsi, zsedc )
-                      CALL wrk_dealloc( jpi, jpj, jpk, zlight, zsoufer )
-      IF( ln_p5z )    CALL wrk_dealloc( jpi, jpj, jpk, ztrpo4, ztrdop )
-      IF( ln_ligand ) CALL wrk_dealloc( jpi, jpj, zwsfep )
+      IF( ln_p5z )    DEALLOCATE( ztrpo4, ztrdop )
+      IF( ln_ligand ) DEALLOCATE( zwsfep )
       !
       IF( ln_timing )  CALL timing_stop('p4z_sed')