Changeset 2006

Timestamp:

2010-07-09T17:07:57+02:00 (13 years ago)

Author:

acc

Message:

ticket #684 step 9a: Code fixes to achieve first successful compilation of mid-year merge code

Location:

branches/DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC

Files:

• DOM/dom_oce.F90 (modified) (2 diffs)
• SBC/sbcrnf.F90 (modified) (6 diffs)
• lib_fortran.F90 (copied) (copied from branches/DEV_1879_mpp_rep/NEMO/OPA_SRC/lib_fortran.F90)

branches/DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/DOM/dom_oce.F90

@@ -213 +213 @@
 
    !!----------------------------------------------------------------------
+   !! mpp reproducibility
+   !!----------------------------------------------------------------------
+#if defined key_mpp_rep1 || defined key_mpp_re2
+   LOGICAL, PUBLIC, PARAMETER ::   lk_mpp_rep = .TRUE.    !: agrif flag
+#else
+   LOGICAL, PUBLIC, PARAMETER ::   lk_mpp_rep = .FALSE.   !: agrif flag
+#endif
+   !!----------------------------------------------------------------------
    !! agrif domain
    !!----------------------------------------------------------------------
@@ -230 +238 @@
 #endif
 
-   !!----------------------------------------------------------------------
-   !! mpp reproducibility
-   !!----------------------------------------------------------------------
-#if defined key_mpp_rep1 || defined key_mpp_re2
-   LOGICAL, PUBLIC, PARAMETER ::   lk_mpp_rep = .TRUE.    !: agrif flag
-#else
-   LOGICAL, PUBLIC, PARAMETER ::   lk_mpp_rep = .FALSE.   !: agrif flag
-#endif
    !!======================================================================
 END MODULE dom_oce

branches/DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/SBC/sbcrnf.F90

@@ -84 +84 @@
       !!
       INTEGER  ::   ji, jj   ! dummy loop indices
-      INTEGER  ::   ierror   ! temporary integer
       !!----------------------------------------------------------------------
       !                                   
@@ -115 +114 @@
 
          IF( MOD( kt-1, nn_fsbc ) == 0 ) THEN
-            rnf(:,:)  = rn_rfact * ( sf_rnf(1)%fnow(:,:) )  
+            rnf(:,:)  = rn_rfact * ( sf_rnf(1)%fnow(:,:,1) )  
             IF ( ln_rnf_att ) THEN  
-               rnf_sal(:,:) = ( sf_sal_rnf(1)%fnow(:,:) )  
-               rnf_tmp(:,:) = ( sf_tmp_rnf(1)%fnow(:,:) )  
+               rnf_sal(:,:) = ( sf_sal_rnf(1)%fnow(:,:,1) )  
+               rnf_tmp(:,:) = ( sf_tmp_rnf(1)%fnow(:,:,1) )  
             ELSE  
                rnf_sal(:,:) = 0  
@@ -141 +140 @@
       !! ** Action  : - read parameters
       !!----------------------------------------------------------------------
+      INTEGER  ::   ierror   ! temporary integer
       CHARACTER(len=32) ::   rn_dep_file   ! runoff file name  
       !! 
@@ -195 +195 @@
             CALL ctl_stop( 'sbc_rnf: unable to allocate sf_rnf structure' )   ;   RETURN
          ENDIF
-         ALLOCATE( sf_rnf(1)%fnow(jpi,jpj) )
-         ALLOCATE( sf_rnf(1)%fdta(jpi,jpj,2) )
+         ALLOCATE( sf_rnf(1)%fnow(jpi,jpj,1) )
+         ALLOCATE( sf_rnf(1)%fdta(jpi,jpj,1,2) )
 
          IF( ln_rnf_att ) THEN
@@ -203 +203 @@
                CALL ctl_stop( 'sbc_sal_rnf: unable to allocate sf_sal_rnf structure' )   ;   RETURN
             ENDIF
-            ALLOCATE( sf_sal_rnf(1)%fnow(jpi,jpj) )
-            ALLOCATE( sf_sal_rnf(1)%fdta(jpi,jpj,2) )
+            ALLOCATE( sf_sal_rnf(1)%fnow(jpi,jpj,1) )
+            ALLOCATE( sf_sal_rnf(1)%fdta(jpi,jpj,1,2) )
 
             ALLOCATE( sf_tmp_rnf(1), STAT=ierror )
@@ -210 +210 @@
                 CALL ctl_stop( 'sbc_tmp_rnf: unable to allocate sf_tmp_rnf structure' )   ;   RETURN
             ENDIF
-            ALLOCATE( sf_tmp_rnf(1)%fnow(jpi,jpj) )
-            ALLOCATE( sf_tmp_rnf(1)%fdta(jpi,jpj,2) )
+            ALLOCATE( sf_tmp_rnf(1)%fnow(jpi,jpj,1) )
+            ALLOCATE( sf_tmp_rnf(1)%fdta(jpi,jpj,1,2) )
          ENDIF
          ! fill sf_rnf with sn_rnf and control print