Changeset 227 for codes/icosagcm/branches/SATURN_DYNAMICO/LMDZ.COMMON/libf/phystd/ocean_slab_mod.F90

Timestamp:

07/16/14 18:05:01 (10 years ago)

Author:

milmd

Message:

Last LMDZ version (1315) with OpenMP directives and other stuff

File:

• codes/icosagcm/branches/SATURN_DYNAMICO/LMDZ.COMMON/libf/phystd/ocean_slab_mod.F90 (modified) (7 diffs)

codes/icosagcm/branches/SATURN_DYNAMICO/LMDZ.COMMON/libf/phystd/ocean_slab_mod.F90

@@ -15 +15 @@
 
 
-#include "dimensions.h"
-#include "dimphys.h"
+!#include "dimensions.h"
+!#include "dimphys.h"
 #include "comcstfi.h"
 #include "callkeys.h"
@@ -26 +26 @@
   
   !LOGICAL, PRIVATE, SAVE  :: ok_slab_sic,ok_slab_heaT_h2O_ice_liqBS
-  !$OMP THREADPRIVATE(ok_slab_sic,ok_slab_heaT_h2O_ice_liqBS)
+  !!$OMP THREADPRIVATE(ok_slab_sic,ok_slab_heaT_h2O_ice_liqBS)
   !INTEGER, PRIVATE, SAVE                           :: slab_ekman, slab_cadj
-  !$OMP THREADPRIVATE(slab_ekman,slab_cadj)
+  !!$OMP THREADPRIVATE(slab_ekman,slab_cadj)
   INTEGER, PRIVATE, SAVE                           :: lmt_pas, julien, idayvrai
   !$OMP THREADPRIVATE(lmt_pas,julien,idayvrai)
@@ -67 +67 @@
 
 
-#include "dimensions.h"
-#include "dimphys.h"
+!#include "dimensions.h"
+!#include "dimphys.h"
 #include "comcstfi.h"
 #include "callkeys.h"
@@ -210 +210 @@
       use slab_ice_h
 
-#include "dimensions.h"
-#include "dimphys.h"
+!#include "dimensions.h"
+!#include "dimphys.h"
 #include "comcstfi.h"
 #include "callkeys.h"
@@ -451 +451 @@
     use slab_ice_h 
 
-#include "dimensions.h"
-#include "comcstfi.h"
+!#include "dimensions.h"
+!#include "comcstfi.h"
 !    INCLUDE "iniprint.h"
 #include "callkeys.h"
@@ -534 +534 @@
 !  Transport diffusif
 !         IF (ok_soil_hdiff) THEN
-             CALL divgrad_phy(noceanmx,tmp_tslab_loc,dtdiff_loc)
+             CALL divgrad_phy(ngrid,noceanmx,tmp_tslab_loc,dtdiff_loc)
              dtdiff_loc=dtdiff_loc*soil_hdiff*50./SUM(slabh)!*100.
  !           dtdiff_loc(:,1)=dtdiff_loc(:,1)*soil_hdiff*50./SUM(slabh)*0.8
@@ -544 +544 @@
 ! Calcul  de transport par Ekman
 
-          CALL slab_ekman2(taux_slab,tauy_slab,tslab,dtekman_loc)
+          CALL slab_ekman2(ngrid,taux_slab,tauy_slab,tslab,dtekman_loc)