Changeset 2817

Timestamp:

2011-08-01T11:10:53+02:00 (13 years ago)

Author:

charris

Message:

Fixes to 10m wind and CO2 flux following e-mails from Sebastien and Christian.

File:

• branches/2011/dev_r2802_UKMO8_sbccpl/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90 (modified) (3 diffs)

branches/2011/dev_r2802_UKMO8_sbccpl/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90

@@ -762 +762 @@
       ENDIF
 
-      ! u(v)tau and taum will be modified by ice model (wndm will be changed by PISCES)
+      ! u(v)tau and taum will be modified by ice model
       ! -> need to be reset before each call of the ice/fsbc      
       IF( MOD( kt-1, k_fsbc ) == 0 ) THEN
@@ -769 +769 @@
          vtau(:,:) = frcv(jpr_oty1)%z3(:,:,1)
          taum(:,:) = frcv(jpr_taum)%z3(:,:,1)
-         wndm(:,:) = frcv(jpr_w10m)%z3(:,:,1)
          CALL iom_put( "taum_oce", taum )   ! output wind stress module
          !  
       ENDIF
+
+#if defined key_cpl_carbon_cycle
+      !                                                              ! atmosph. CO2 (ppm)
+      IF( srcv(jpr_co2)%laction )   atm_co2(:,:) = frcv(jpr_co2)%z3(:,:,1)
+#endif
+
       !                                                      ! ========================= !
       IF( k_ice <= 1 ) THEN                                  !  heat & freshwater fluxes ! (Ocean only case)
@@ -821 +826 @@
          emps(:,:) = emp(:,:)                                        ! concentration/dilution = emp
   
-         !                                                           ! 10 m wind speed
-         IF( srcv(jpr_w10m)%laction )   wndm(:,:) = frcv(jpr_w10m)%z3(:,:,1)
-         !
-#if defined key_cpl_carbon_cycle
-         !                                                              ! atmosph. CO2 (ppm)
-         IF( srcv(jpr_co2)%laction )   atm_co2(:,:) = frcv(jpr_co2)%z3(:,:,1)
-#endif
-
       ENDIF
       !