Changeset 13576 for branches/UKMO/AMM15_v3_6_STABLE_package_collate/NEMOGCM/NEMO/TOP_SRC/FABM/inputs_fabm.F90

Timestamp:

2020-10-09T12:35:11+02:00 (4 years ago)

Author:

dford

Message:

Update NEMO-FABM coupler for FABM v1, and introduce two-way NEMO-ERSEM coupling options. See ​https://code.metoffice.gov.uk/trac/utils/ticket/366.

File:

• branches/UKMO/AMM15_v3_6_STABLE_package_collate/NEMOGCM/NEMO/TOP_SRC/FABM/inputs_fabm.F90 (modified) (6 diffs)

branches/UKMO/AMM15_v3_6_STABLE_package_collate/NEMOGCM/NEMO/TOP_SRC/FABM/inputs_fabm.F90

@@ -19 +19 @@
    USE fldread
    USE par_fabm
-   USE fabm
+   USE fabm, only: type_fabm_horizontal_variable_id
 
    IMPLICIT NONE
+
+#  include "vectopt_loop_substitute.h90"
 
    PRIVATE
@@ -40 +42 @@
 
    TYPE, PUBLIC, EXTENDS(type_input_variable) :: type_input_data
-      TYPE(type_horizontal_variable_id)   :: horizontal_id
-      TYPE(type_input_data), POINTER   :: next => null()
+      TYPE(type_fabm_horizontal_variable_id) :: horizontal_id
+      TYPE(type_input_data), POINTER         :: next => null()
    END TYPE
    TYPE (type_input_data), POINTER, PUBLIC :: first_input_data => NULL()
@@ -87 +89 @@
            ALLOCATE(input_data, STAT=ierr)
            IF( ierr > 0 ) CALL ctl_stop( 'STOP', 'inputs_fabm:initialize_inputs: unable to allocate input_data object for variable '//TRIM(name) )
-           input_data%horizontal_id = fabm_get_horizontal_variable_id(model,name)
-           IF (.NOT.fabm_is_variable_used(input_data%horizontal_id)) THEN
+           input_data%horizontal_id = model%get_horizontal_variable_id(name)
+           IF (.NOT.model%is_variable_used(input_data%horizontal_id)) THEN
               ! This variable was not found among FABM's horizontal variables (at least, those that are read by one or more FABM modules)
               CALL ctl_stop('STOP', 'inputs_fabm:initialize_inputs: variable "'//TRIM(name)//'" was not found among horizontal FABM variables.')
@@ -130 +132 @@
            ! within tracer field
            DO jn=1,jp_fabm
-             IF (TRIM(name) == TRIM(model%state_variables(jn)%name)) THEN
+             IF (TRIM(name) == TRIM(model%interior_state_variables(jn)%name)) THEN
                river_data%jp_pos = jp_fabm_m1+jn
              END IF
@@ -173 +175 @@
          ! Provide FABM with pointer to field that will receive prescribed data.
          ! NB source=data_source_user guarantees that the prescribed data takes priority over any data FABM may already have for that variable.
-         CALL fabm_link_horizontal_data(model,input_data%horizontal_id,input_data%sf(1)%fnow(:,:,1),source=data_source_user)
+         CALL model%link_horizontal_data(input_data%horizontal_id,input_data%sf(1)%fnow(:,:,1),source=data_source_user)
          input_data => input_data%next
       END DO
@@ -226 +228 @@
 #endif
         IF( kt == nit000 .OR. ( kt /= nit000 ) ) THEN
-            DO jj = 1, jpj
-              DO ji = 1, jpi
+            DO jj = 2, jpjm1
+              DO ji = fs_2, fs_jpim1
                 ! convert units and divide by surface area
                 ! loading / cell volume * vertical fraction of riverload