Changeset 1308 for trunk/LMDZ.GENERIC/libf/phystd/ocean_slab_mod.F90

Timestamp:

Jul 10, 2014, 3:19:01 PM (11 years ago)

Author:

emillour

Message:

Generic GCM:
Some cleanup to simplify dynamics/physics interactions by getting rid
of dimphys.h (i.e. the nlayermx parameter) and minimizing use of
dimension.h in the physics.
EM

File:

• trunk/LMDZ.GENERIC/libf/phystd/ocean_slab_mod.F90 (modified) (6 diffs)

trunk/LMDZ.GENERIC/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"
@@ -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)