Changeset 22656

Timestamp:

04/02/18 11:22:11 (7 years ago)

Author:

seroussi

Message:

CHG: cleaning up ocean information exchange

Location:

issm/trunk-jpl/src/c

Files:

• cores/transient_core.cpp (modified) (4 diffs)
• main/issm_ocean.cpp (modified) (2 diffs)

issm/trunk-jpl/src/c/cores/transient_core.cpp

@@ -77 +77 @@
 
         if(isoceancoupling){
-                _printf_("startin ocean coupling \n");
+                if(VerboseSolution()) _printf0_("   ocean coupling: initialization \n");
                 int my_rank;
                 int oceannxsize,oceannysize;
@@ -94 +94 @@
                 tomitgcmcomm=parcom->GetParameterValue();
                 if(my_rank==0){
-                        _printf_("starting ocean coupling rank 0 \n");
-                        _printf_("coupling time: "<< coupling_time <<"\n");
                         ISSM_MPI_Send(&coupling_time,1,ISSM_MPI_DOUBLE,0,10001000,tomitgcmcomm);
                         ISSM_MPI_Send(&time,1,ISSM_MPI_DOUBLE,0,10001001,tomitgcmcomm);
@@ -101 +99 @@
                         ISSM_MPI_Recv(&oceannxsize,1,ISSM_MPI_INT,0,10001003,tomitgcmcomm,&status);
                         ISSM_MPI_Recv(&oceannysize,1,ISSM_MPI_INT,0,10001004,tomitgcmcomm,&status);
-                        _printf_("ocean time: "<< oceantime<<"\n");
-                        _printf_("nx size : "<< oceannxsize<<"\n");
-                        _printf_("ny size : "<< oceannysize<<"\n");
                         oceangridx = xNew<IssmDouble>(oceannxsize*oceannysize);
                         ISSM_MPI_Recv(oceangridx,oceannxsize*oceannysize,ISSM_MPI_DOUBLE,0,10001005,tomitgcmcomm,&status);
-                        _printf_("gridx received \n");
                         oceangridy = xNew<IssmDouble>(oceannxsize*oceannysize);
                         ISSM_MPI_Recv(oceangridy,oceannxsize*oceannysize,ISSM_MPI_DOUBLE,0,10001006,tomitgcmcomm,&status);
-                        _printf_("gridy received \n");
                         icebase = xNew<IssmDouble>(oceannxsize*oceannysize);
                         for(int i=0;i<oceannxsize;i++){
@@ -117 +110 @@
                         }
                         ISSM_MPI_Send(icebase,oceannxsize*oceannysize,ISSM_MPI_DOUBLE,0,10001008,tomitgcmcomm);
-                        _printf_("base sent\n");
                         oceanmelt = xNew<IssmDouble>(oceannxsize*oceannysize);
                         ISSM_MPI_Recv(oceanmelt,oceannxsize*oceannysize,ISSM_MPI_DOUBLE,0,10001007,tomitgcmcomm,&status);
-                        _printf_("ocean melt received\n");
                         xDelete<IssmDouble>(icebase);
                         xDelete<IssmDouble>(oceangridx);

issm/trunk-jpl/src/c/main/issm_ocean.cpp

@@ -31 +31 @@
         icecommsize=(int) strtol(argv[2], (char **)NULL, 10);
 
-        printf("Ice: My global rank: %i My world size: %i \n",my_rank,my_size);
-
         /*Split world into sub-communicators for each and every model:*/
         ISSM_MPI_Comm_split(worldcomm,0, my_rank, &modelcomm);
@@ -38 +36 @@
         ISSM_MPI_Comm_size(modelcomm,&my_local_size);
 
-        printf("Ice: My global rank: %i My local rank: %i My world size: %i My local size: %i\n",my_rank,my_local_rank,my_size,my_local_size);
-
         ISSM_MPI_Intercomm_create( modelcomm, 0, worldcomm, my_local_size, 0, &tomitgcmcomm); 
 
-//      /*send an integer:*/
-//      int dummy1,dummy2;
-//      dummy1=3; dummy2=0;
-//      if(my_local_rank==0){
-//              MPI_Send(&dummy1,1,MPI_INT,0,1,tomitgcmcomm);
-//              MPI_Recv(&dummy2,1,MPI_INT,0,1,tomitgcmcomm,&status);
-//      }
-//      MPI_Bcast(&dummy2,1,MPI_INT,0,modelcomm);
-//      printf("Ice: dummy received: %i\n",dummy2);
-
-        /*Initialize femmodel from arguments provided command line: */
         FemModel *femmodel = new FemModel(argc,argv,modelcomm);