Changeset 7327 for branches/2015

Timestamp:

2016-11-24T12:37:33+01:00 (7 years ago)

Author:

cetlod

Message:

update offline vvl branch with head of 3.6 stable

Location:

branches/2015/dev_r6946_Offline_vvl/NEMOGCM/NEMO

Files:

• OPA_SRC/C1D/step_c1d.F90 (modified) (1 diff)
• OPA_SRC/DOM/closea.F90 (modified) (1 diff)
• TOP_SRC/trcsub.F90 (modified) (1 diff)

branches/2015/dev_r6946_Offline_vvl/NEMOGCM/NEMO/OPA_SRC/C1D/step_c1d.F90

@@ -60 +60 @@
 
                              indic = 0                ! reset to no error condition
-      IF( kstp == nit000 )   CALL iom_init( "nemo")   ! iom_put initialization (must be done after nemo_init for AGRIF+XIOS+OASIS)
+      IF( kstp == nit000 )   CALL iom_init( cxios_context )   ! iom_put initialization (must be done after nemo_init for AGRIF+XIOS+OASIS)
       IF( kstp /= nit000 )   CALL day( kstp )         ! Calendar (day was already called at nit000 in day_init)
-                             CALL iom_setkt( kstp - nit000 + 1, "nemo" )   ! say to iom that we are at time step kstp
+                             CALL iom_setkt( kstp - nit000 + 1, cxios_context )   ! say to iom that we are at time step kstp
 
       !>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>

branches/2015/dev_r6946_Offline_vvl/NEMOGCM/NEMO/OPA_SRC/DOM/closea.F90

@@ -158 +158 @@
          CASE ( 025 )                                ! ORCA_R025 configuration
             !                                        ! =======================
+            isrow = 1207 - jpjglo                    !  eORCA025 R025 - Using full isf­extended  
+                                                     !  domain for reference. - Adjust j­indices
             ncsnr(1)   = 1    ; ncstt(1)   = 0               ! Caspian + Aral sea
-            ncsi1(1)   = 1330 ; ncsj1(1)   = 645
-            ncsi2(1)   = 1400 ; ncsj2(1)   = 795
+            ncsi1(1)   = 1330 ; ncsj1(1)   = 831 - isrow
+            ncsi2(1)   = 1400 ; ncsj2(1)   = 981 - isrow
             ncsir(1,1) = 1    ; ncsjr(1,1) = 1
             !                                        
             ncsnr(2)   = 1    ; ncstt(2)   = 0               ! Azov Sea 
-            ncsi1(2)   = 1284 ; ncsj1(2)   = 722
-            ncsi2(2)   = 1304 ; ncsj2(2)   = 747
+            ncsi1(2)   = 1284 ; ncsj1(2)   = 908 - isrow
+            ncsi2(2)   = 1304 ; ncsj2(2)   = 933 - isrow
             ncsir(2,1) = 1    ; ncsjr(2,1) = 1
+            !
+            ncsnr(3)   = 1    ; ncstt(3)   = 0               ! Great Lakes
+            ncsi1(3)   = 775  ; ncsj1(3)   = 866 - isrow
+            ncsi2(3)   = 848  ; ncsj2(3)   = 931 - isrow
+            ncsir(3,1) = 1    ; ncsjr(3,1) = 1
+            !   
+            ncsnr(4)   = 1    ; ncstt(4)   = 0               ! Lake Victoria
+            ncsi1(4)   = 1270 ; ncsj1(4)   = 661 - isrow
+            ncsi2(4)   = 1295 ; ncsj2(4)   = 696 - isrow
+            ncsir(4,1) = 1    ; ncsjr(4,1) = 1
+            !        
             !
          END SELECT

branches/2015/dev_r6946_Offline_vvl/NEMOGCM/NEMO/TOP_SRC/trcsub.F90

@@ -16 +16 @@
    USE in_out_manager
    USE lbclnk
-#if defined key_zdftke
-   USE zdftke          ! twice TKE (en)
-#endif
-#if defined key_zdfgls
-   USE zdfgls, ONLY: en
-#endif
    USE trabbl
    USE zdf_oce