Changeset 8257

Timestamp:

2017-06-30T13:48:02+02:00 (7 years ago)

Author:

andmirek

Message:

few improvements and fixe to run GO6

Location:

branches/UKMO/test_moci_test_suite/NEMOGCM

Files:

• CONFIG/SHARED/field_def.xml (modified) (1 diff)
• NEMO/OPA_SRC/IOM/iom.F90 (modified) (6 diffs)

branches/UKMO/test_moci_test_suite/NEMOGCM/CONFIG/SHARED/field_def.xml

@@ -221 +221 @@
 
          <!-- * variable related to ice shelf forcing * -->
+         <field id="qisf"         long_name="Ice Shelf Heat Flux"                           unit="W/m2"     />
          <field id="berg_calve"   long_name="Iceberg calving"                               unit="kg/m2/s"  />
          <field id="fwfisf"       long_name="Ice shelf melting"                             unit="kg/m2/s"  />

branches/UKMO/test_moci_test_suite/NEMOGCM/NEMO/OPA_SRC/IOM/iom.F90

@@ -406 +406 @@
          ENDIF
         END DO
+#else
+        CALL ctl_stop( "Can not set without XIOS2: error in set_rstr_active")
 #endif
    END SUBROUTINE set_rstr_active
@@ -411 +413 @@
    SUBROUTINE set_rstw_active(rst_file, it)
 !sets enabled = .TRUE. for each field in restart file
-#if defined key_xios2
    CHARACTER(len=*) :: rst_file
    INTEGER, INTENT(in) :: it ! timestep when iom_init was called
+#if defined key_xios2
    TYPE(xios_field) :: field_hdl
    TYPE(xios_file) :: file_hdl
@@ -419 +421 @@
    INTEGER :: i
 
-!set then name of the restart file (OUTPUT!) and enable available fields
+!set the name of the restart file (OUTPUT!) and enable available fields
         if(lwp) WRITE(numout,*) 'Setting (output) restart filename (for XIOS) to: ',TRIM(rst_file)
         CALL xios_get_handle("file_definition", filegroup_hdl )
@@ -663 +665 @@
              ENDDO
        ENDIF
+#else
+       CALL ctl_stop( "Can not set without XIOS2: error in set_rstrw_active")
 #endif
    END SUBROUTINE set_rstw_active
@@ -1927 +1931 @@
       CALL iom_set_domain_attr("grid_"//cdgrd, data_dim=2, data_ibegin = 1-nldi, data_ni = jpi, data_jbegin = 1-nldj, data_nj = jpj)
 
+      CALL iom_set_domain_attr("grid_"//cdgrd, lonvalue = RESHAPE(plon(nldi:nlei,nldj:nlej),(/ ni*nj /)),   &
+         &                                     latvalue = RESHAPE(plat(nldi:nlei, nldj:nlej),(/ ni*nj /)))
       IF ( lmask ) THEN
-          CALL iom_set_domain_attr("grid_"//cdgrd, lonvalue = RESHAPE(plon(nldi:nlei,nldj:nlej),(/ ni*nj /)),   &
-         &                                     latvalue = RESHAPE(plat(nldi:nlei, nldj:nlej),(/ ni*nj /)))
          ! mask land points, keep values on coast line -> specific mask for U, V and W points
          SELECT CASE ( cdgrd )
@@ -2090 +2094 @@
       CALL iom_set_domain_attr("gznl", lonvalue = zlon,   &
          &                             latvalue = RESHAPE(plat(nldi:nlei, nldj:nlej),(/ ni*nj /)))  
-       CALL iom_set_zoom_domain_attr ("ptr", ibegin=ix-1, jbegin=0, ni=1, nj=jpjglo)
+      CALL iom_set_zoom_domain_attr ("ptr", ibegin=ix-1, jbegin=0, ni=1, nj=jpjglo)
 #endif