Changeset 2958 for branches/2011/dev_r2782_NOCS_Griffies/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_iso_grif.F90

Timestamp:

2011-10-19T11:00:38+02:00 (13 years ago)

Author:

agn

Message:

Edited trcadv.F90 to only add the eiv transport if ln_traldf_grif is false
Removed warning from traldf_iso_grif.F90 and prevent duplicate allocation of ah_slp2 etc
Modified trcldf.F90 to use tra_ldf_iso_grif; removed whitespace

File:

• branches/2011/dev_r2782_NOCS_Griffies/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_iso_grif.F90 (modified) (1 diff)

branches/2011/dev_r2782_NOCS_Griffies/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_iso_grif.F90

@@ -127 +127 @@
       !zdkt(1:jpi,1:jpj,0:1) => wrk_3d_9(:,:,1:2)
 
-      IF( kt == nit000 )  THEN
+      IF( kt == nit000.AND..NOT.ALLOCATED(ah_wslp2) )  THEN
          IF(lwp) WRITE(numout,*)
          IF(lwp) WRITE(numout,*) 'tra_ldf_iso_grif : rotated laplacian diffusion operator on ', cdtype
-         IF(lwp) WRITE(numout,*) '                   WARNING: STILL UNDER TEST, NOT RECOMMENDED. USE AT YOUR OWN PERIL'
          IF(lwp) WRITE(numout,*) '~~~~~~~~~~~'
          ALLOCATE( ah_wslp2(jpi,jpj,jpk) , zdkt(jpi,jpj,0:1), STAT=ierr )