Changeset 3448 for LMDZ6/trunk

Timestamp:

Jan 25, 2019, 5:48:33 PM (6 years ago)

Author:

oboucher

Message:

small changes for interactive CO2
cleaning up END IF statements

File:

• LMDZ6/trunk/libf/phylmd/cpl_mod.F90 (modified) (16 diffs)

LMDZ6/trunk/libf/phylmd/cpl_mod.F90

@@ -204 +204 @@
 
 ! Allocate variable in carbon_cycle_mod
-       ALLOCATE(fco2_ocn_day(klon), stat = error)
+       IF (.NOT.ALLOCATED(fco2_ocn_day)) ALLOCATE(fco2_ocn_day(klon), stat = error)
        sum_error = sum_error + error
-    END IF
+    ENDIF
 
     IF (sum_error /= 0) THEN
@@ -259 +259 @@
                 "-",nbp_lon,nbp_lat,nhoridct,1,1,1,-99,32,"inst",dtime,dtime)
          ENDIF
-       END DO
+       ENDDO
        CALL histend(nidct)
        CALL histsync(nidct)
@@ -272 +272 @@
                 "-",nbp_lon,nbp_lat,nhoridcs,1,1,1,-99,32,"inst",dtime,dtime)
          ENDIF
-       END DO
+       ENDDO
        CALL histend(nidcs)
        CALL histsync(nidcs)
@@ -286 +286 @@
        abort_message='carbon_cycle_cpl does not work with opa8'
        CALL abort_physic(modname,abort_message,1)
-    END IF
+    ENDIF
 
   END SUBROUTINE cpl_init
@@ -356 +356 @@
                 CALL histwrite(nidcs,inforecv(i)%name,itau_w,tab_read_flds(:,:,i),nbp_lon*(nbp_lat),ndexcs)
             ENDIF
-          END DO
+          ENDDO
        ENDIF
 
@@ -415 +415 @@
        ENDDO
 
-    END IF ! if time to receive
+    ENDIF ! if time to receive
 
   END SUBROUTINE cpl_receive_frac
@@ -466 +466 @@
        DO i=1,klon
           index(i)=i
-       END DO
+       ENDDO
        CALL cpl2gath(read_co2, fco2_ocn_day, klon, index)
-    END IF
+    ENDIF
 
 !*************************************************************************************
@@ -477 +477 @@
     DO i=1, knon
        tsurf_new(i) = tsurf_new(i)/(1. - sic_new(i))
-    END DO
+    ENDDO
 
   END SUBROUTINE cpl_receive_ocean_fields
@@ -529 +529 @@
        tsurf_new(i) = tsurf_new(i) / sic_new(i)
        alb_new(i)   = alb_new(i)   / sic_new(i)
-    END DO
+    ENDDO
 
   END SUBROUTINE cpl_receive_seaice_fields
@@ -637 +637 @@
           cpl_atm_co2(ig,cpl_index) = cpl_atm_co2(ig,cpl_index) + &
                co2_send(knindex(ig))/ REAL(nexca) 
-       END IF
+!!---OB: this is correct but why knindex ??
+       ENDIF
      ENDDO
 
@@ -682 +683 @@
              ALLOCATE(cpl_atm_co22D(nbp_lon,jj_nb), stat=error)
              sum_error = sum_error + error
-          END IF
+          ENDIF
 
           IF (sum_error /= 0) THEN
@@ -886 +887 @@
              ALLOCATE(cpl_atm_co22D(nbp_lon,jj_nb), stat=error)
              sum_error = sum_error + error
-          END IF
+          ENDIF
 
           IF (sum_error /= 0) THEN
@@ -917 +918 @@
        DO ig = 1, knon
           cpl_fder_tmp(knindex(ig))=cpl_fder(ig,cpl_index)
-       END DO
+       ENDDO
        CALL gath2cpl(cpl_fder_tmp(:), cpl_fder2D(:,:,cpl_index), &
             klon, unity)
@@ -1139 +1140 @@
        tab_flds(:,:,ids_runcoa) = cpl_rcoa2D(:,:)
        tab_flds(:,:,ids_rivflu) = cpl_rriv2D(:,:)
-    END IF
+    ENDIF
 
 !*************************************************************************************
@@ -1252 +1253 @@
                   cpl_tauy2D(:,:,2) * pctsrf2D(:,:,is_sic) / deno(:,:)
           ENDWHERE
-       END IF
+       ENDIF
 
     ENDIF ! is_omp_root
@@ -1336 +1337 @@
        DEALLOCATE(cpl_atm_co22D, stat=error )
        sum_error = sum_error + error
-    END IF
+    ENDIF
 
     IF (sum_error /= 0) THEN