Changeset 12381

Timestamp:

2020-02-13T15:15:49+01:00 (4 years ago)

Author:

dcarneir

Message:

Updating GO6 branch with G06 version in the apps trunk

Location:

branches/UKMO/dev_r5518_GO6_package_FOAMv14_sit/NEMOGCM/NEMO

Files:

• OPA_SRC/DYN/dynspg_ts.F90 (modified) (2 diffs)
• OPA_SRC/STO/stopack.F90 (modified) (2 diffs)
• TOP_SRC/MEDUSA/air_sea.F90 (modified) (2 diffs)

branches/UKMO/dev_r5518_GO6_package_FOAMv14_sit/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90

@@ -45 +45 @@
    USE agrif_opa_interp ! agrif
 #endif
-#if defined key_asminc   
-   USE asminc          ! Assimilation increment
-#endif
 
    IMPLICIT NONE
@@ -459 +456 @@
                 &                        + fwfisf(:,:) + fwfisf_b(:,:)                     )
       ENDIF
-#if defined key_asminc
-      !                                         ! Include the IAU weighted SSH increment
-      IF( lk_asminc .AND. ln_sshinc .AND. ln_asmiau ) THEN
-         zssh_frc(:,:) = zssh_frc(:,:) - ssh_iau(:,:)
-      ENDIF
-#endif
-      !                                   !* Fill boundary data arrays for AGRIF
-      !                                   ! ------------------------------------
+      !                                   !* Fill boundary data arrays with AGRIF
+      !                                   ! -------------------------------------
 #if defined key_agrif
          IF( .NOT.Agrif_Root() ) CALL agrif_dta_ts( kt )

branches/UKMO/dev_r5518_GO6_package_FOAMv14_sit/NEMOGCM/NEMO/OPA_SRC/STO/stopack.F90

@@ -1022 +1022 @@
        DO jk=1,jpk
          coeff(:,:,jk) = exp(gauss) * coeff(:,:,jk)
-       ENDDOF
+       ENDDO
 #elif defined key_dynldf_c2d
        coeff = exp(gauss) * coeff
@@ -1033 +1033 @@
        DO jk=1,jpk
          coeff(:,:,jk) = exp(gauss) * coeff(:,:,jk)
-       ENDDOF
+       ENDDO
 #elif defined key_dynldf_c2d
        coeff = exp(gauss) * coeff

branches/UKMO/dev_r5518_GO6_package_FOAMv14_sit/NEMOGCM/NEMO/TOP_SRC/MEDUSA/air_sea.F90

@@ -203 +203 @@
                     (zalk(ji,jj) > 35.0E2 ).OR.(zalk(ji,jj) <= 0.0 ) .OR.     &
                     (zdic(ji,jj) > 35.0E2 ).OR.(zdic(ji,jj) <= 0.0 ) .OR.     &
-                    (f_kw660(ji,jj) > 1.0E-2 ).OR.(f_kw660(ji,jj) < 0.0 ) ) THEN
-                  IF(lwp) THEN 
+                    (f_kw660(ji,jj) > 2.0E-2 ).OR.(f_kw660(ji,jj) < 0.0 ) ) THEN
+                  !IF(lwp) THEN 
                       WRITE(numout,*) ' surface T = ',ztmp(ji,jj)
                       WRITE(numout,*) ' surface S = ',zsal(ji,jj)
@@ -219 +219 @@
                                        ' kt = ', kt 
                       WRITE(numout,*) 'MEDUSA - Air-Sea INPUT: unrealistic surface Carb. Chemistry'
-                  ENDIF     
+                      WRITE(numout,*) 'E R R O R'
+                  !ENDIF     
                   CALL ctl_stop( 'MEDUSA - Air-Sea INPUT: ',             &
                                  'unrealistic surface Carb. Chemistry -- INPUTS' )